[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, 224 insertions, 185 deletions

diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index c6f2142..1b3b1f0 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -2,164 +2,187 @@
 Expected output for 'h5dump --xml tcompound.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">
-   <NamedDataType Name="#6632:0" OBJ-XID="/#6632:0" Parents="root">
-      <DataType>
-      <CompoundType>
-         <Field FieldName="int">
-            <DataType> 
-               <AtomicType>
-                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </AtomicType>
-            </DataType>
-         </Field>
-         <Field FieldName="float">
-            <DataType> 
-               <AtomicType>
-                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </AtomicType>
-            </DataType>
-         </Field>
-      </CompoundType>
-      </DataType>
-   </NamedDataType>
-   <NamedDataType Name="type1" OBJ-XID="/type1" Parents="root">
-      <DataType>
-      <CompoundType>
-         <Field FieldName="int_name">
-            <DataType> 
-               <AtomicType>
-                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </AtomicType>
-            </DataType>
-         </Field>
-         <Field FieldName="float_name">
-            <DataType> 
-               <AtomicType>
-                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </AtomicType>
-            </DataType>
-         </Field>
-      </CompoundType>
-      </DataType>
-   </NamedDataType>
-   <NamedDataType Name="type2" OBJ-XID="/type2" Parents="root">
-      <DataType>
-      <CompoundType>
-         <Field FieldName="int_array">
-            <DataType> 
-               <ArrayType Ndims="1">
-                  <ArrayDimension DimSize="4" DimPerm="0"/>
-                  <DataType>
-                     <AtomicType>
-                        <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                     </AtomicType>
-                  </DataType>
-               </ArrayType>
-            </DataType>
-         </Field>
-         <Field FieldName="float_array">
-            <DataType> 
-               <ArrayType Ndims="2">
-                  <ArrayDimension DimSize="5" DimPerm="0"/>
-                  <ArrayDimension DimSize="6" DimPerm="1"/>
-                  <DataType>
-                     <AtomicType>
-                        <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                     </AtomicType>
-                  </DataType>
-               </ArrayType>
-            </DataType>
-         </Field>
-      </CompoundType>
-      </DataType>
-   </NamedDataType>
-   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="5" MaxDimSize="5"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <CompoundType>
-            <Field FieldName="a_name">
-               <DataType>
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="b_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="c_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </DataType>
+<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:NamedDataType Name="#6632:0" OBJ-XID="xid_4294967294-4294967293" Parents="xid_696-0" H5ParentPaths="/">
+      <hdf5:DataType>
+      <hdf5:CompoundType>
+         <hdf5:Field FieldName="int">
+            <hdf5:DataType>
+               <hdf5:AtomicType>
+                  <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </hdf5:AtomicType>
+            </hdf5:DataType>
+         </hdf5:Field>
+         <hdf5:Field FieldName="float">
+            <hdf5:DataType>
+               <hdf5:AtomicType>
+                  <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+               </hdf5:AtomicType>
+            </hdf5:DataType>
+         </hdf5:Field>
+      </hdf5:CompoundType>
+      </hdf5:DataType>
+   </hdf5:NamedDataType>
+   <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424-0" H5Path="/type1" Parents="xid_696-0" H5ParentPaths="/">
+      <hdf5:DataType>
+      <hdf5:CompoundType>
+         <hdf5:Field FieldName="int_name">
+            <hdf5:DataType>
+               <hdf5:AtomicType>
+                  <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </hdf5:AtomicType>
+            </hdf5:DataType>
+         </hdf5:Field>
+         <hdf5:Field FieldName="float_name">
+            <hdf5:DataType>
+               <hdf5:AtomicType>
+                  <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+               </hdf5:AtomicType>
+            </hdf5:DataType>
+         </hdf5:Field>
+      </hdf5:CompoundType>
+      </hdf5:DataType>
+   </hdf5:NamedDataType>
+   <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792-0" H5Path="/type2" Parents="xid_696-0" H5ParentPaths="/">
+      <hdf5:DataType>
+      <hdf5:CompoundType>
+         <hdf5:Field FieldName="int_array">
+            <hdf5:DataType>
+               <hdf5:ArrayType Ndims="1">
+                  <hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:ArrayType>
+            </hdf5:DataType>
+         </hdf5:Field>
+         <hdf5:Field FieldName="float_array">
+            <hdf5:DataType>
+               <hdf5:ArrayType Ndims="2">
+                  <hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
+                  <hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:ArrayType>
+            </hdf5:DataType>
+         </hdf5:Field>
+      </hdf5:CompoundType>
+      </hdf5:DataType>
+   </hdf5:NamedDataType>
+   <hdf5:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/">
+      <hdf5:StorageLayout>
+         <hdf5:ContiguousLayout/>
+      </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <hdf5:FillValue>
+               <hdf5:NoFill/>
+         </hdf5:FillValue>
+      </hdf5:FillValueInfo>
+      <hdf5:Dataspace>
+         <hdf5:SimpleDataspace Ndims="1">
+            <hdf5:Dimension  DimSize="5" MaxDimSize="5"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="a_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="b_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="c_name">
+               <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:Field>
+         </hdf5:CompoundType>
+      </hdf5:DataType>
    <!-- Note: format of compound data not specified -->
-      <Data>
-         <DataFromFile>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2
-         </DataFromFile>
-      </Data>
-   </Dataset>
-   <Group Name="group1" OBJ-XID="/group1" Parents="/" >
-      <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
-         <DataType>
-         <CompoundType>
-            <Field FieldName="int">
-               <DataType> 
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="float">
-               <DataType> 
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-         </DataType>
-      </NamedDataType>
-      <Dataset Name="dset2" OBJ-XID="/group1/dset2" Parents="/group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="5" MaxDimSize="5"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <NamedDataTypePtr OBJ-XID="/type1"/>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Group Name="group1" OBJ-XID="xid_2104-0" H5Path="/group1" Parents="xid_696-0" H5ParentPaths="/" >
+      <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592-0" H5Path="/group1/type3" Parents="xid_2104-0" H5ParentPaths="/group1">
+         <hdf5:DataType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="float">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
+         </hdf5:DataType>
+      </hdf5:NamedDataType>
+      <hdf5:Dataset Name="dset2" OBJ-XID="xid_2152-0" H5Path= "/group1/dset2" Parents="xid_2104-0" H5ParentPaths="/group1">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+                  <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="5" MaxDimSize="5"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_1424-0" H5Path="/type1" />
       <!-- Note: format of compound data not specified -->
-         <Data>
-            <DataFromFile>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
             0 0 1 1.1 2 2.2 3 3.3 4 4.4
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="dset3" OBJ-XID="/group1/dset3" Parents="/group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="2">
-               <Dimension  DimSize="3" MaxDimSize="3"/>
-               <Dimension  DimSize="6" MaxDimSize="6"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <NamedDataTypePtr OBJ-XID="/type2"/>
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="dset3" OBJ-XID="xid_2872-0" H5Path= "/group1/dset3" Parents="xid_2104-0" H5ParentPaths="/group1">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+                  <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="2">
+               <hdf5:Dimension  DimSize="3" MaxDimSize="3"/>
+               <hdf5:Dimension  DimSize="6" MaxDimSize="6"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_2792-0" H5Path="/type2" />
       <!-- Note: format of compound data not specified -->
-         <Data>
-            <DataFromFile>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
              0 1 2 3   1 2 3 4 5 6 
                   2 3 4 5 6 7 
                   3 4 5 6 7 8 
@@ -250,39 +273,55 @@ Expected output for 'h5dump --xml tcompound.h5'
                   10 11 12 13 14 15 
                   11 12 13 14 15 16 
                   12 13 14 15 16 17 
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="dset4" OBJ-XID="/group1/dset4" Parents="/group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="5" MaxDimSize="5"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <NamedDataTypePtr OBJ-XID="/group1/type3"/>
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="dset4" OBJ-XID="xid_5672-0" H5Path= "/group1/dset4" Parents="xid_2104-0" H5ParentPaths="/group1">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+                  <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="5" MaxDimSize="5"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_5592-0" H5Path="/group1/type3" />
       <!-- Note: format of compound data not specified -->
-         <Data>
-            <DataFromFile>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
             0 3 1 4 2 5 3 6 4 7
-            </DataFromFile>
-         </Data>
-      </Dataset>
-   </Group>
-   <Group Name="group2" OBJ-XID="/group2" Parents="/" >
-      <Dataset Name="dset5" OBJ-XID="/group2/dset5" Parents="/group2">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="5" MaxDimSize="5"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <NamedDataTypePtr OBJ-XID="/#6632:0"/>
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+   <hdf5:Group Name="group2" OBJ-XID="xid_6584-0" H5Path="/group2" Parents="xid_696-0" H5ParentPaths="/" >
+      <hdf5:Dataset Name="dset5" OBJ-XID="xid_7040-0" H5Path= "/group2/dset5" Parents="xid_6584-0" H5ParentPaths="/group2">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+                  <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="5" MaxDimSize="5"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_7040-0"/>
       <!-- Note: format of compound data not specified -->
-         <Data>
-            <DataFromFile>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
             0 0 1 0.1 2 0.2 3 0.3 4 0.4
-            </DataFromFile>
-         </Data>
-      </Dataset>
-   </Group>
-</RootGroup>
-</HDF5-File>
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>