[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, 107 insertions, 84 deletions

diff --git a/tools/testfiles/tobjref.h5.xml b/tools/testfiles/tobjref.h5.xml
index d3dacb5..09d33a1 100644
--- a/tools/testfiles/tobjref.h5.xml
+++ b/tools/testfiles/tobjref.h5.xml
@@ -2,93 +2,116 @@
 Expected output for 'h5dump --xml tobjref.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="Dataset3" OBJ-XID="/Dataset3" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="4" MaxDimSize="4"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <ReferenceType>
-               <ObjectReferenceType />
-            </ReferenceType>
-         </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="Dataset3" OBJ-XID="xid_2348-0" H5Path= "/Dataset3" 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="4" MaxDimSize="4"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:ReferenceType>
+               <hdf5:ObjectReferenceType />
+            </hdf5:ReferenceType>
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+   <hdf5:Data>
+   <hdf5:DataFromFile>
       "/Group1/Dataset1"
       "/Group1/Dataset2"
       "/Group1"
       "/Group1/Datatype1"
-   </DataFromFile>
-   </Data>
-   </Dataset>
-   <Group Name="Group1" OBJ-XID="/Group1" Parents="/" >
-      <NamedDataType Name="Datatype1" OBJ-XID="/Group1/Datatype1" Parents="/Group1">
-         <DataType>
-         <CompoundType>
-            <Field FieldName="a">
-               <DataType> 
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="b">
-               <DataType> 
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="c">
-               <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="Dataset1" OBJ-XID="/Group1/Dataset1" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="4" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
+   </hdf5:DataFromFile>
+   </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Group Name="Group1" OBJ-XID="xid_1320-0" H5Path="/Group1" Parents="xid_696-0" H5ParentPaths="/" >
+      <hdf5:NamedDataType Name="Datatype1" OBJ-XID="xid_2268-0" H5Path="/Group1/Datatype1" Parents="xid_1320-0" H5ParentPaths="/Group1">
+         <hdf5:DataType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="a">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="b">
+               <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">
+               <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="Dataset1" OBJ-XID="xid_1696-0" H5Path= "/Group1/Dataset1" Parents="xid_1320-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="4" MaxDimSize="4"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:IntegerType ByteOrder="BE" Sign="false" Size="4" />
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
             0 3 6 9
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="Dataset2" OBJ-XID="/Group1/Dataset2" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_2152-0" H5Path= "/Group1/Dataset2" Parents="xid_1320-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="4" MaxDimSize="4"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:IntegerType ByteOrder="BE" Sign="false" Size="1" />
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
             0 0 0 0
-            </DataFromFile>
-         </Data>
-      </Dataset>
-   </Group>
-</RootGroup>
-</HDF5-File>
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>