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

diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/testfiles/tall-2A.h5.xml
new file mode 100644
index 0000000..4866eb1
--- /dev/null
+++ b/tools/testfiles/tall-2A.h5.xml
@@ -0,0 +1,185 @@
+#############################
+Expected output for 'h5dump --xml -A tall.h5'
+#############################
+<?xml version="1.0" encoding="UTF-8"?>
+<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:Attribute Name="attr1">
+      <hdf5:Dataspace>
+         <hdf5:SimpleDataspace Ndims="1">
+            <hdf5:Dimension  DimSize="10" MaxDimSize="10"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="1" />
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
+         97 98 99 100 101 102 103 104 105 0
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Attribute>
+   <hdf5:Attribute Name="attr2">
+      <hdf5:Dataspace>
+         <hdf5:SimpleDataspace Ndims="2">
+            <hdf5:Dimension  DimSize="2" MaxDimSize="2"/>
+            <hdf5:Dimension  DimSize="2" MaxDimSize="2"/>
+         </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
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Attribute>
+   <hdf5:Group Name="g1" OBJ-XID="xid_1344-0" H5Path="/g1" Parents="xid_696-0" H5ParentPaths="/" >
+      <hdf5:Group Name="g1.1" OBJ-XID="xid_2968-0" H5Path="/g1/g1.1" Parents="xid_1344-0" H5ParentPaths="/g1" >
+         <hdf5:Dataset Name="dset1.1.1" OBJ-XID="xid_4968-0" H5Path= "/g1/g1.1/dset1.1.1" Parents="xid_2968-0" H5ParentPaths="/g1/g1.1">
+            <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="10" MaxDimSize="10"/>
+                  <hdf5:Dimension  DimSize="10" MaxDimSize="10"/>
+               </hdf5:SimpleDataspace>
+            </hdf5:Dataspace>
+            <hdf5:DataType>
+               <hdf5:AtomicType>
+                  <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </hdf5:AtomicType>
+            </hdf5:DataType>
+            <hdf5:Attribute Name="attr1">
+               <hdf5:Dataspace>
+                  <hdf5:SimpleDataspace Ndims="1">
+                     <hdf5:Dimension  DimSize="27" MaxDimSize="27"/>
+                  </hdf5:SimpleDataspace>
+               </hdf5:Dataspace>
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="1" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+               <hdf5:Data>
+                  <hdf5:DataFromFile>
+                  49 115 116 32 97 116 116 114 105 98 117 116 101 32 111 102 32 
+                  100 115 101 116 49 46 49 46 49 0
+                  </hdf5:DataFromFile>
+               </hdf5:Data>
+            </hdf5:Attribute>
+            <hdf5:Attribute Name="attr2">
+               <hdf5:Dataspace>
+                  <hdf5:SimpleDataspace Ndims="1">
+                     <hdf5:Dimension  DimSize="27" MaxDimSize="27"/>
+                  </hdf5:SimpleDataspace>
+               </hdf5:Dataspace>
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="1" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+               <hdf5:Data>
+                  <hdf5:DataFromFile>
+                  50 110 100 32 97 116 116 114 105 98 117 116 101 32 111 102 32 
+                  100 115 101 116 49 46 49 46 49 0
+                  </hdf5:DataFromFile>
+               </hdf5:Data>
+            </hdf5:Attribute>
+         <hdf5:Data>
+         <hdf5:NoData/>
+         </hdf5:Data>
+         </hdf5:Dataset>
+         <hdf5:Dataset Name="dset1.1.2" OBJ-XID="xid_5968-0" H5Path= "/g1/g1.1/dset1.1.2" Parents="xid_2968-0" H5ParentPaths="/g1/g1.1">
+            <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:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </hdf5:AtomicType>
+            </hdf5:DataType>
+         <hdf5:Data>
+         <hdf5:NoData/>
+         </hdf5:Data>
+         </hdf5:Dataset>
+      </hdf5:Group>
+      <hdf5:Group Name="g1.2" OBJ-XID="xid_3944-0" H5Path="/g1/g1.2" Parents="xid_1344-0" H5ParentPaths="/g1" >
+         <hdf5:Group Name="g1.2.1" OBJ-XID="xid_4592-0" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3944-0" H5ParentPaths="/g1/g1.2" >
+            <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_4294967294-4294967293" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue"  Parents="xid_4592-0" H5ParentPaths="/g1/g1.2/g1.2.1" />
+         </hdf5:Group>
+      </hdf5:Group>
+   </hdf5:Group>
+   <hdf5:Group Name="g2" OBJ-XID="xid_2320-0" H5Path="/g2" Parents="xid_696-0" H5ParentPaths="/" >
+      <hdf5:Dataset Name="dset2.1" OBJ-XID="xid_6648-0" H5Path= "/g2/dset2.1" Parents="xid_2320-0" H5ParentPaths="/g2">
+         <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="10" MaxDimSize="10"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <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:Data>
+      <hdf5:NoData/>
+      </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="dset2.2" OBJ-XID="xid_7288-0" H5Path= "/g2/dset2.2" Parents="xid_2320-0" H5ParentPaths="/g2">
+         <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="5" MaxDimSize="5"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <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:Data>
+      <hdf5:NoData/>
+      </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>