[svn-r7276] Purpose:

This is an omibus update to the h5dump program.

  1. Fixes bug 888
  2. updates XML output to 1.6

Description:

Solution:

Platforms tested:

verbena, arabica, copper (64)

Misc. update:
MANIFEST updated
Need to do release notes.

1 files changed, 64 insertions, 51 deletions

diff --git a/tools/testfiles/tdset2.h5.xml b/tools/testfiles/tdset2.h5.xml
index fa7ebd3..d8ecec5 100644
--- a/tools/testfiles/tdset2.h5.xml
+++ b/tools/testfiles/tdset2.h5.xml
@@ -2,29 +2,35 @@
 Expected output for 'h5dump --xml tdset2.h5'
 #############################
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
-<HDF5-File>
-<RootGroup OBJ-XID="root">
-   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
-      <StorageLayout>
-         <ChunkedLayout Ndims="2">
-            <ChunkDimension DimSize="5" />
-            <ChunkDimension DimSize="5" />
-         </ChunkedLayout>
-      </StorageLayout>
-      <Dataspace>
-         <SimpleDataspace Ndims="2">
-            <Dimension  DimSize="10" MaxDimSize="UNLIMITED"/>
-            <Dimension  DimSize="20" MaxDimSize="20"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-         </AtomicType>
-      </DataType>
-      <Data>
-         <DataFromFile>
+<hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
+<hdf5:RootGroup OBJ-XID="xid_696-0" H5Path="/">
+   <hdf5:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/">
+      <hdf5:StorageLayout>
+         <hdf5:ChunkedLayout Ndims="2">
+            <hdf5:ChunkDimension DimSize="5" />
+            <hdf5:ChunkDimension DimSize="5" />
+            <hdf5:RequiredFilter>
+            </hdf5:RequiredFilter>
+         </hdf5:ChunkedLayout>
+      </hdf5:StorageLayout>
+      <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental">
+         <hdf5:FillValue>
+               <hdf5:NoFill/>
+         </hdf5:FillValue>
+      </hdf5:FillValueInfo>
+      <hdf5:Dataspace>
+         <hdf5:SimpleDataspace Ndims="2">
+            <hdf5:Dimension  DimSize="10" MaxDimSize="UNLIMITED"/>
+            <hdf5:Dimension  DimSize="20" MaxDimSize="20"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
          0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
          0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
@@ -35,29 +41,36 @@ Expected output for 'h5dump --xml tdset2.h5'
          0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
          0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 
          0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
-         </DataFromFile>
-      </Data>
-   </Dataset>
-   <Dataset Name="dset2" OBJ-XID="/dset2" Parents="root">
-      <StorageLayout>
-         <ChunkedLayout Ndims="2">
-            <ChunkDimension DimSize="5" />
-            <ChunkDimension DimSize="5" />
-         </ChunkedLayout>
-      </StorageLayout>
-      <Dataspace>
-         <SimpleDataspace Ndims="2">
-            <Dimension  DimSize="30" MaxDimSize="30"/>
-            <Dimension  DimSize="10" MaxDimSize="UNLIMITED"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
-         </AtomicType>
-      </DataType>
-      <Data>
-         <DataFromFile>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Dataset Name="dset2" OBJ-XID="xid_3800-0" H5Path= "/dset2" Parents="xid_696-0" H5ParentPaths="/">
+      <hdf5:StorageLayout>
+         <hdf5:ChunkedLayout Ndims="2">
+            <hdf5:ChunkDimension DimSize="5" />
+            <hdf5:ChunkDimension DimSize="5" />
+            <hdf5:RequiredFilter>
+            </hdf5:RequiredFilter>
+         </hdf5:ChunkedLayout>
+      </hdf5:StorageLayout>
+      <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental">
+         <hdf5:FillValue>
+               <hdf5:NoFill/>
+         </hdf5:FillValue>
+      </hdf5:FillValueInfo>
+      <hdf5:Dataspace>
+         <hdf5:SimpleDataspace Ndims="2">
+            <hdf5:Dimension  DimSize="30" MaxDimSize="30"/>
+            <hdf5:Dimension  DimSize="10" MaxDimSize="UNLIMITED"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          0 1 2 3 4 5 6 7 8 9 
          0 1 2 3 4 5 6 7 8 9 
          0 1 2 3 4 5 6 7 8 9 
@@ -88,8 +101,8 @@ Expected output for 'h5dump --xml tdset2.h5'
          0 1 2 3 4 5 6 7 8 9 
          0 1 2 3 4 5 6 7 8 9 
          0 1 2 3 4 5 6 7 8 9
-         </DataFromFile>
-      </Data>
-   </Dataset>
-</RootGroup>
-</HDF5-File>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>