[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, 151 insertions, 112 deletions

diff --git a/tools/testfiles/tstr.h5.xml b/tools/testfiles/tstr.h5.xml
index b31aacc..711a6bd 100644
--- a/tools/testfiles/tstr.h5.xml
+++ b/tools/testfiles/tstr.h5.xml
@@ -2,49 +2,56 @@
 Expected output for 'h5dump --xml tstr.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="comp1" OBJ-XID="/comp1" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="2">
-            <Dimension  DimSize="3" MaxDimSize="3"/>
-            <Dimension  DimSize="6" MaxDimSize="6"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <CompoundType>
-            <Field FieldName="int_array">
-               <DataType>
-                  <ArrayType Ndims="2">
-                     <ArrayDimension DimSize="8" DimPerm="0"/>
-                     <ArrayDimension DimSize="10" DimPerm="1"/>
-                     <DataType>
-                        <AtomicType>
-                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </AtomicType>
-                     </DataType>
-                  </ArrayType>
-               </DataType>
-            </Field>
-            <Field FieldName="string">
-               <DataType>
-                  <ArrayType Ndims="2">
-                     <ArrayDimension DimSize="3" DimPerm="0"/>
-                     <ArrayDimension DimSize="4" DimPerm="1"/>
-                     <DataType>
-                        <AtomicType>
-                           <StringType Cset="H5T_CSET_ASCII" StrSize="32" StrPad="H5T_STR_SPACEPAD"/>
-                        </AtomicType>
-                     </DataType>
-                  </ArrayType>
-               </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:Dataset Name="comp1" OBJ-XID="xid_2520-0" H5Path= "/comp1" 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="2">
+            <hdf5:Dimension  DimSize="3" MaxDimSize="3"/>
+            <hdf5:Dimension  DimSize="6" MaxDimSize="6"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="int_array">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="2">
+                     <hdf5:ArrayDimension DimSize="8" DimPerm="0"/>
+                     <hdf5:ArrayDimension DimSize="10" DimPerm="1"/>
+                     <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="string">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="2">
+                     <hdf5:ArrayDimension DimSize="3" DimPerm="0"/>
+                     <hdf5:ArrayDimension DimSize="4" DimPerm="1"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="32" StrPad="H5T_STR_SPACEPAD"/>
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
+      </hdf5:DataType>
    <!-- Note: format of compound data not specified -->
-      <Data>
-         <DataFromFile>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
           0 1 4 9 16 25 36 49 64 81 
                1 4 9 16 25 36 49 64 81 100 
                4 9 16 25 36 49 64 81 100 121 
@@ -225,23 +232,31 @@ Expected output for 'h5dump --xml tstr.h5'
                144 169 196 225 256 289 324 361 400 441   "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
                "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
                "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" 
-         </DataFromFile>
-      </Data>
-   </Dataset>
-   <Dataset Name="string1" OBJ-XID="/string1" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="2">
-            <Dimension  DimSize="3" MaxDimSize="3"/>
-            <Dimension  DimSize="4" MaxDimSize="4"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <StringType Cset="H5T_CSET_ASCII" StrSize="5" StrPad="H5T_STR_NULLTERM"/>
-         </AtomicType>
-      </DataType>
-      <Data>
-         <DataFromFile>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Dataset Name="string1" OBJ-XID="xid_744-0" H5Path= "/string1" 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="2">
+            <hdf5:Dimension  DimSize="3" MaxDimSize="3"/>
+            <hdf5:Dimension  DimSize="4" MaxDimSize="4"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="5" StrPad="H5T_STR_NULLTERM"/>
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          "s1"
          "s2"
          "s3"
@@ -254,22 +269,30 @@ Expected output for 'h5dump --xml tstr.h5'
          "s0"
          "s1"
          "s2"
-         </DataFromFile>
-      </Data>
-   </Dataset>
-   <Dataset Name="string2" OBJ-XID="/string2" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="20" MaxDimSize="20"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <StringType Cset="H5T_CSET_ASCII" StrSize="11" StrPad="H5T_STR_SPACEPAD"/>
-         </AtomicType>
-      </DataType>
-      <Data>
-         <DataFromFile>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Dataset Name="string2" OBJ-XID="xid_1244-0" H5Path= "/string2" 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="20" MaxDimSize="20"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="11" StrPad="H5T_STR_SPACEPAD"/>
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          "ab cd ef1  "
          "ab cd ef2  "
          "ab cd ef3  "
@@ -290,22 +313,30 @@ Expected output for 'h5dump --xml tstr.h5'
          "ab cd ef8  "
          "ab cd ef9  "
          "ab cd ef0  "
-         </DataFromFile>
-      </Data>
-   </Dataset>
-   <Dataset Name="string3" OBJ-XID="/string3" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="27" MaxDimSize="27"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <StringType Cset="H5T_CSET_ASCII" StrSize="8" StrPad="H5T_STR_NULLPAD"/>
-         </AtomicType>
-      </DataType>
-      <Data>
-         <DataFromFile>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Dataset Name="string3" OBJ-XID="xid_1576-0" H5Path= "/string3" 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="27" MaxDimSize="27"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="8" StrPad="H5T_STR_NULLPAD"/>
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          "abcd0"
          "abcd1"
          "abcd2"
@@ -333,27 +364,35 @@ Expected output for 'h5dump --xml tstr.h5'
          "abcd4"
          "abcd5"
          "abcd6"
-         </DataFromFile>
-      </Data>
-   </Dataset>
-   <Dataset Name="string4" OBJ-XID="/string4" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="3" MaxDimSize="3"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <StringType Cset="H5T_CSET_ASCII" StrSize="168" StrPad="H5T_STR_SPACEPAD"/>
-         </AtomicType>
-      </DataType>
-      <Data>
-         <DataFromFile>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Dataset Name="string4" OBJ-XID="xid_1904-0" H5Path= "/string4" 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="3" MaxDimSize="3"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="168" StrPad="H5T_STR_SPACEPAD"/>
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          "s1234567890123456789                                                                                                                                                    "
          "s1234567890123456789                                                                                                                                                    "
          "s1234567890123456789                                                                                                                                                    "
-         </DataFromFile>
-      </Data>
-   </Dataset>
-</RootGroup>
-</HDF5-File>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>