philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r3506]

Browse Source 
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.
This commit is contained in:
Robert E. McGrath
2001-02-23 17:07:15 -05:00
parent d6a4d2a3d6
commit 9dfe128921
10 changed files with 1144 additions and 1276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
tools/testfiles/tobjref.h5.xml
View File

@@ -5,54 +5,7 @@ Expected output for 'h5dump --xml tobjref.h5'
<!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>
"/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">
<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>
</NamedDataType>
<Dataset Name="Dataset1" OBJ-XID="/Group1/Dataset1" Parents="/Group1">
<Dataspace>
<SimpleDataspace Ndims="1">
@@ -87,6 +40,53 @@ Expected output for 'h5dump --xml tobjref.h5'
</DataFromFile>
</Data>
</Dataset>
<NamedDataType Name="Datatype1" OBJ-XID="/Group1/Datatype1" Parents="/Group1">
<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>
</NamedDataType>
</Group>
<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>
"/Group1/Dataset1"
"/Group1/Dataset2"
"/Group1"
"/Group1/Datatype1"
</DataFromFile>
</Data>
</Dataset>
</RootGroup>
</HDF5-File>