[svn-r3506]

Purpose:
    Bug fix.
Description:
    Order of elements in groups is wrong.  (Need to find out why
    h5gen accepted this at all.)
    Note that test output had to be corrected in some cases.
Solution:
    Fixed xml_dump_group to do the right order to match the DTD
Platforms tested:
    Linux, solaris.

1 files changed, 121 insertions, 121 deletions

diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index 25db6ae..3d4342a 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -5,128 +5,7 @@ Expected output for 'h5dump --xml tcompound.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
-   <NamedDataType Name="#6632:0" OBJ-XID="/#6632:0" Parents="root">
-      <CompoundType>
-         <Field FieldName="int">
-            <DataType> 
-               <AtomicType>
-                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </AtomicType>
-            </DataType>
-         </Field>
-         <Field FieldName="float">
-            <DataType> 
-               <AtomicType>
-                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </AtomicType>
-            </DataType>
-         </Field>
-      </CompoundType>
-   </NamedDataType>
-   <NamedDataType Name="type1" OBJ-XID="/type1" Parents="root">
-      <CompoundType>
-         <Field FieldName="int_name">
-            <DataType> 
-               <AtomicType>
-                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </AtomicType>
-            </DataType>
-         </Field>
-         <Field FieldName="float_name">
-            <DataType> 
-               <AtomicType>
-                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </AtomicType>
-            </DataType>
-         </Field>
-      </CompoundType>
-   </NamedDataType>
-   <NamedDataType Name="type2" OBJ-XID="/type2" Parents="root">
-      <CompoundType>
-         <Field FieldName="int_array">
-            <DataType> 
-               <ArrayType Ndims="1">
-                  <ArrayDimension DimSize="4" DimPerm="0"/>
-                  <DataType>
-                     <AtomicType>
-                        <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                     </AtomicType>
-                  </DataType>
-               </ArrayType>
-            </DataType>
-         </Field>
-         <Field FieldName="float_array">
-            <DataType> 
-               <ArrayType Ndims="2">
-                  <ArrayDimension DimSize="5" DimPerm="0"/>
-                  <ArrayDimension DimSize="6" DimPerm="1"/>
-                  <DataType>
-                     <AtomicType>
-                        <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                     </AtomicType>
-                  </DataType>
-               </ArrayType>
-            </DataType>
-         </Field>
-      </CompoundType>
-   </NamedDataType>
-   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="5" MaxDimSize="5"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <CompoundType>
-            <Field FieldName="a_name">
-               <DataType>
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="b_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="c_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </DataType>
-   <!-- Note: format of compound data not specified -->
-      <Data>
-         <DataFromFile>
-         0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2
-         </DataFromFile>
-      </Data>
-   </Dataset>
    <Group Name="group1" OBJ-XID="/group1" Parents="/" >
-      <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
-         <CompoundType>
-            <Field FieldName="int">
-               <DataType> 
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="float">
-               <DataType> 
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </NamedDataType>
       <Dataset Name="dset2" OBJ-XID="/group1/dset2" Parents="/group1">
          <Dataspace>
             <SimpleDataspace Ndims="1">
@@ -259,6 +138,24 @@ Expected output for 'h5dump --xml tcompound.h5'
             </DataFromFile>
          </Data>
       </Dataset>
+      <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
+         <CompoundType>
+            <Field FieldName="int">
+               <DataType> 
+                  <AtomicType>
+                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="float">
+               <DataType> 
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+         </CompoundType>
+      </NamedDataType>
    </Group>
    <Group Name="group2" OBJ-XID="/group2" Parents="/" >
       <Dataset Name="dset5" OBJ-XID="/group2/dset5" Parents="/group2">
@@ -276,5 +173,108 @@ Expected output for 'h5dump --xml tcompound.h5'
          </Data>
       </Dataset>
    </Group>
+   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="5" MaxDimSize="5"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <DataType> 
+         <CompoundType>
+            <Field FieldName="a_name">
+               <DataType>
+                  <AtomicType>
+                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="b_name">
+               <DataType>
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="c_name">
+               <DataType>
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+         </CompoundType>
+      </DataType>
+   <!-- Note: format of compound data not specified -->
+      <Data>
+         <DataFromFile>
+         0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2
+         </DataFromFile>
+      </Data>
+   </Dataset>
+   <NamedDataType Name="#6632:0" OBJ-XID="/#6632:0" Parents="root">
+      <CompoundType>
+         <Field FieldName="int">
+            <DataType> 
+               <AtomicType>
+                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </AtomicType>
+            </DataType>
+         </Field>
+         <Field FieldName="float">
+            <DataType> 
+               <AtomicType>
+                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+               </AtomicType>
+            </DataType>
+         </Field>
+      </CompoundType>
+   </NamedDataType>
+   <NamedDataType Name="type1" OBJ-XID="/type1" Parents="root">
+      <CompoundType>
+         <Field FieldName="int_name">
+            <DataType> 
+               <AtomicType>
+                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </AtomicType>
+            </DataType>
+         </Field>
+         <Field FieldName="float_name">
+            <DataType> 
+               <AtomicType>
+                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+               </AtomicType>
+            </DataType>
+         </Field>
+      </CompoundType>
+   </NamedDataType>
+   <NamedDataType Name="type2" OBJ-XID="/type2" Parents="root">
+      <CompoundType>
+         <Field FieldName="int_array">
+            <DataType> 
+               <ArrayType Ndims="1">
+                  <ArrayDimension DimSize="4" DimPerm="0"/>
+                  <DataType>
+                     <AtomicType>
+                        <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                     </AtomicType>
+                  </DataType>
+               </ArrayType>
+            </DataType>
+         </Field>
+         <Field FieldName="float_array">
+            <DataType> 
+               <ArrayType Ndims="2">
+                  <ArrayDimension DimSize="5" DimPerm="0"/>
+                  <ArrayDimension DimSize="6" DimPerm="1"/>
+                  <DataType>
+                     <AtomicType>
+                        <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </AtomicType>
+                  </DataType>
+               </ArrayType>
+            </DataType>
+         </Field>
+      </CompoundType>
+   </NamedDataType>
 </RootGroup>
 </HDF5-File>