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

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