[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, 164 insertions, 0 deletions

diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/testfiles/tempty-ns-2.h5.xml
new file mode 100644
index 0000000..432b781
--- /dev/null
+++ b/tools/testfiles/tempty-ns-2.h5.xml
@@ -0,0 +1,164 @@
+#############################
+Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5'
+#############################
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:HDF5-File xmlns:thing="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">
+<thing:RootGroup OBJ-XID="xid_928-0" H5Path="/">
+   <thing:Dataset Name="Dataset1.0" OBJ-XID="xid_976-0" H5Path= "/Dataset1.0" Parents="xid_928-0" H5ParentPaths="/">
+      <thing:StorageLayout>
+         <thing:ContiguousLayout/>
+      </thing:StorageLayout>
+         <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <thing:FillValue>
+               <thing:NoFill/>
+         </thing:FillValue>
+      </thing:FillValueInfo>
+      <thing:Dataspace>
+         <thing:SimpleDataspace Ndims="1">
+            <thing:Dimension  DimSize="4" MaxDimSize="4"/>
+         </thing:SimpleDataspace>
+      </thing:Dataspace>
+      <thing:DataType>
+         <thing:VLType>
+            <thing:DataType>
+               <thing:AtomicType>
+                  <thing:IntegerType ByteOrder="LE" Sign="true" Size="4" />
+               </thing:AtomicType>
+            </thing:DataType>
+         </thing:VLType>
+      </thing:DataType>
+<!-- Note: format of VL data not specified -->
+      <thing:Data>
+         <thing:DataFromFile>
+                    
+         </thing:DataFromFile>
+      </thing:Data>
+   </thing:Dataset>
+   <thing:Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/">
+      <thing:StorageLayout>
+         <thing:ContiguousLayout/>
+      </thing:StorageLayout>
+         <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <thing:FillValue>
+               <thing:NoFill/>
+         </thing:FillValue>
+      </thing:FillValueInfo>
+      <thing:Dataspace>
+         <thing:SimpleDataspace Ndims="1">
+            <thing:Dimension  DimSize="4" MaxDimSize="4"/>
+         </thing:SimpleDataspace>
+      </thing:Dataspace>
+      <thing:DataType>
+         <thing:AtomicType>
+            <thing:IntegerType ByteOrder="LE" Sign="true" Size="4" />
+         </thing:AtomicType>
+      </thing:DataType>
+      <thing:Data>
+         <thing:DataFromFile>
+         0 0 0 0
+         </thing:DataFromFile>
+      </thing:Data>
+   </thing:Dataset>
+   <thing:Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/">
+      <thing:StorageLayout>
+         <thing:ContiguousLayout/>
+      </thing:StorageLayout>
+         <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <thing:FillValue>
+               <thing:NoFill/>
+         </thing:FillValue>
+      </thing:FillValueInfo>
+      <thing:Dataspace>
+         <thing:SimpleDataspace Ndims="1">
+            <thing:Dimension  DimSize="4" MaxDimSize="4"/>
+         </thing:SimpleDataspace>
+      </thing:Dataspace>
+      <thing:DataType>
+         <thing:AtomicType>
+            <thing:FloatType ByteOrder="LE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+         </thing:AtomicType>
+      </thing:DataType>
+      <thing:Data>
+         <thing:DataFromFile>
+         0 0 0 0
+         </thing:DataFromFile>
+      </thing:Data>
+   </thing:Dataset>
+   <thing:Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/">
+      <thing:StorageLayout>
+         <thing:ContiguousLayout/>
+      </thing:StorageLayout>
+         <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <thing:FillValue>
+               <thing:NoFill/>
+         </thing:FillValue>
+      </thing:FillValueInfo>
+      <thing:Dataspace>
+         <thing:SimpleDataspace Ndims="1">
+            <thing:Dimension  DimSize="4" MaxDimSize="4"/>
+         </thing:SimpleDataspace>
+      </thing:Dataspace>
+      <thing:DataType>
+         <thing:ArrayType Ndims="1">
+            <thing:ArrayDimension DimSize="4" DimPerm="0"/>
+            <thing:DataType>
+               <thing:AtomicType>
+                  <thing:IntegerType ByteOrder="LE" Sign="true" Size="4" />
+               </thing:AtomicType>
+            </thing:DataType>
+         </thing:ArrayType>
+      </thing:DataType>
+      <thing:Data>
+         <thing:DataFromFile>
+          0 0 0 0   0 0 0 0   0 0 0 0   0 0 0 0 
+         </thing:DataFromFile>
+      </thing:Data>
+   </thing:Dataset>
+   <thing:Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/">
+      <thing:StorageLayout>
+         <thing:ContiguousLayout/>
+      </thing:StorageLayout>
+         <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <thing:FillValue>
+               <thing:NoFill/>
+         </thing:FillValue>
+      </thing:FillValueInfo>
+      <thing:Dataspace>
+         <thing:SimpleDataspace Ndims="1">
+            <thing:Dimension  DimSize="4" MaxDimSize="4"/>
+         </thing:SimpleDataspace>
+      </thing:Dataspace>
+      <thing:DataType>
+         <thing:CompoundType>
+            <thing:Field FieldName="a">
+               <thing:DataType>
+                  <thing:AtomicType>
+                     <thing:IntegerType ByteOrder="LE" Sign="true" Size="4" />
+                  </thing:AtomicType>
+               </thing:DataType>
+            </thing:Field>
+            <thing:Field FieldName="b">
+               <thing:DataType>
+                  <thing:AtomicType>
+                     <thing:FloatType ByteOrder="LE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </thing:AtomicType>
+               </thing:DataType>
+            </thing:Field>
+            <thing:Field FieldName="c">
+               <thing:DataType>
+                  <thing:AtomicType>
+                     <thing:IntegerType ByteOrder="LE" Sign="true" Size="1" />
+                  </thing:AtomicType>
+               </thing:DataType>
+            </thing:Field>
+         </thing:CompoundType>
+      </thing:DataType>
+   <!-- Note: format of compound data not specified -->
+      <thing:Data>
+         <thing:DataFromFile>
+         0 0 0 0 0 0 0 0 0 0 0 0
+         </thing:DataFromFile>
+      </thing:Data>
+   </thing:Dataset>
+</thing:RootGroup>
+</thing:HDF5-File>