diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-08-08 19:47:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-08-08 19:47:39 (GMT) |
| commit | da29916b94e300a4cdd12178a810c8c859ee8490 (patch) | |
| tree | fc0c29cc3c6721c0ab79581e3f2ff9fabc5cd7bb | |
| parent | d309a7fa5deb83f369e1af15f66d5d19236b29d9 (diff) | |
| download | hdf5-da29916b94e300a4cdd12178a810c8c859ee8490.zip hdf5-da29916b94e300a4cdd12178a810c8c859ee8490.tar.gz hdf5-da29916b94e300a4cdd12178a810c8c859ee8490.tar.bz2 | |
[svn-r7329] Purpose:
Refactored test output
Description:
Chase new output format of 'objno' in DDL and XML schema output
Platforms tested:
h5committested
56 files changed, 334 insertions, 333 deletions
diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/testfiles/tall-2A.h5.xml index 4866eb1..90b6ca8 100644 --- a/tools/testfiles/tall-2A.h5.xml +++ b/tools/testfiles/tall-2A.h5.xml @@ -3,7 +3,7 @@ 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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -40,9 +40,9 @@ Expected output for 'h5dump --xml -A tall.h5' </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:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g1.1" OBJ-XID="xid_2968" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:Dataset Name="dset1.1.1" OBJ-XID="xid_4968" H5Path= "/g1/g1.1/dset1.1.1" Parents="xid_2968" H5ParentPaths="/g1/g1.1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -102,7 +102,7 @@ Expected output for 'h5dump --xml -A tall.h5' <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:Dataset Name="dset1.1.2" OBJ-XID="xid_5968" H5Path= "/g1/g1.1/dset1.1.2" Parents="xid_2968" H5ParentPaths="/g1/g1.1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -126,14 +126,14 @@ Expected output for 'h5dump --xml -A tall.h5' </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 Name="g1.2" OBJ-XID="xid_3944" H5Path="/g1/g1.2" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:Group Name="g1.2.1" OBJ-XID="xid_4592" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3944" H5ParentPaths="/g1/g1.2" > + <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue" Parents="xid_4592" 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:Group Name="g2" OBJ-XID="xid_2320" H5Path="/g2" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset2.1" OBJ-XID="xid_6648" H5Path= "/g2/dset2.1" Parents="xid_2320" H5ParentPaths="/g2"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -156,7 +156,7 @@ Expected output for 'h5dump --xml -A tall.h5' <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:Dataset Name="dset2.2" OBJ-XID="xid_7288" H5Path= "/g2/dset2.2" Parents="xid_2320" H5ParentPaths="/g2"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tall.h5.xml b/tools/testfiles/tall.h5.xml index f124f95..56816be 100644 --- a/tools/testfiles/tall.h5.xml +++ b/tools/testfiles/tall.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml 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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -40,9 +40,9 @@ Expected output for 'h5dump --xml tall.h5' </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:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g1.1" OBJ-XID="xid_2968" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:Dataset Name="dset1.1.1" OBJ-XID="xid_4968" H5Path= "/g1/g1.1/dset1.1.1" Parents="xid_2968" H5ParentPaths="/g1/g1.1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -113,7 +113,7 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataFromFile> </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:Dataset Name="dset1.1.2" OBJ-XID="xid_5968" H5Path= "/g1/g1.1/dset1.1.2" Parents="xid_2968" H5ParentPaths="/g1/g1.1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -139,14 +139,14 @@ Expected output for 'h5dump --xml tall.h5' </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 Name="g1.2" OBJ-XID="xid_3944" H5Path="/g1/g1.2" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:Group Name="g1.2.1" OBJ-XID="xid_4592" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3944" H5ParentPaths="/g1/g1.2" > + <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue" Parents="xid_4592" 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:Group Name="g2" OBJ-XID="xid_2320" H5Path="/g2" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset2.1" OBJ-XID="xid_6648" H5Path= "/g2/dset2.1" Parents="xid_2320" H5ParentPaths="/g2"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -171,7 +171,7 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataFromFile> </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:Dataset Name="dset2.2" OBJ-XID="xid_7288" H5Path= "/g2/dset2.2" Parents="xid_2320" H5ParentPaths="/g2"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tarray1.h5.xml b/tools/testfiles/tarray1.h5.xml index a7caa3b..c0b2575 100644 --- a/tools/testfiles/tarray1.h5.xml +++ b/tools/testfiles/tarray1.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tarray1.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tarray2.h5.xml b/tools/testfiles/tarray2.h5.xml index 9bb40ac..961ba2e 100644 --- a/tools/testfiles/tarray2.h5.xml +++ b/tools/testfiles/tarray2.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tarray2.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tarray3.h5.xml b/tools/testfiles/tarray3.h5.xml index cf31c84..09005d6 100644 --- a/tools/testfiles/tarray3.h5.xml +++ b/tools/testfiles/tarray3.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tarray3.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tarray6.h5.xml b/tools/testfiles/tarray6.h5.xml index fb9cb4c..79a3f97 100644 --- a/tools/testfiles/tarray6.h5.xml +++ b/tools/testfiles/tarray6.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tarray6.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tarray7.h5.xml b/tools/testfiles/tarray7.h5.xml index 3c861c5..bea6216 100644 --- a/tools/testfiles/tarray7.h5.xml +++ b/tools/testfiles/tarray7.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tarray7.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tattr.h5.xml b/tools/testfiles/tattr.h5.xml index b3301a7..e2aee33 100644 --- a/tools/testfiles/tattr.h5.xml +++ b/tools/testfiles/tattr.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tattr.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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> diff --git a/tools/testfiles/tattr2.ls b/tools/testfiles/tattr2.ls index f5d5e3f..18f891f 100644 --- a/tools/testfiles/tattr2.ls +++ b/tools/testfiles/tattr2.ls @@ -21,7 +21,7 @@ dset Dataset {2/2} Data: {1, 1}, {2, 2} Attribute: reference {2} Type: object reference - Data: DATASET-0:1:0:976, DATASET-0:1:0:976 + Data: DATASET-1:976, DATASET-1:976 Attribute: enum {2} Type: enum 32-bit little-endian integer { RED = 0 @@ -41,7 +41,7 @@ dset Dataset {2/2} Attribute: float {2} Type: IEEE 32-bit little-endian float Data: 0, 0 - Location: 0:1:0:976 + Location: 1:976 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 8 logical bytes, 0 allocated bytes diff --git a/tools/testfiles/tbitfields.h5.xml b/tools/testfiles/tbitfields.h5.xml index 1b0d76f..5d455cc 100644 --- a/tools/testfiles/tbitfields.h5.xml +++ b/tools/testfiles/tbitfields.h5.xml @@ -3,9 +3,9 @@ Expected output for 'h5dump --xml tbitfields.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:Group Name="typetests" OBJ-XID="xid_1344-0" H5Path="/typetests" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720-0" H5Path= "/typetests/bitfield_1" Parents="xid_1344-0" H5ParentPaths="/typetests"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -32,7 +32,7 @@ Expected output for 'h5dump --xml tbitfields.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="bitfield_2" OBJ-XID="xid_2352-0" H5Path= "/typetests/bitfield_2" Parents="xid_1344-0" H5ParentPaths="/typetests"> + <hdf5:Dataset Name="bitfield_2" OBJ-XID="xid_2352" H5Path= "/typetests/bitfield_2" Parents="xid_1344" H5ParentPaths="/typetests"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl index da0c926..8bbbde0 100644 --- a/tools/testfiles/tcomp-1.ddl +++ b/tools/testfiles/tcomp-1.ddl @@ -3,7 +3,7 @@ Expected output for 'h5dump tcompound.h5' ############################# HDF5 "tcompound.h5" { GROUP "/" { - DATATYPE "#6632:0" H5T_COMPOUND { + DATATYPE "#6632" H5T_COMPOUND { H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; } @@ -252,7 +252,7 @@ GROUP "/" { } GROUP "group2" { DATASET "dset5" { - DATATYPE "/#6632:0" + DATATYPE "/#6632" DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl index 9977b2b..82a2da0 100644 --- a/tools/testfiles/tcomp-3.ddl +++ b/tools/testfiles/tcomp-3.ddl @@ -1,12 +1,14 @@ ############################# -Expected output for 'h5dump -t /#5992:0 -g /group2 tcompound.h5' +Expected output for 'h5dump -t /#6632 -g /group2 tcompound.h5' ############################# HDF5 "tcompound.h5" { -DATATYPE "/#5992:0" - +DATATYPE "/#6632" H5T_COMPOUND { + H5T_STD_I32BE "int"; + H5T_IEEE_F32BE "float"; +} GROUP "/group2" { DATASET "dset5" { - DATATYPE "/#6632:0" + DATATYPE "/#6632" DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { @@ -34,4 +36,3 @@ GROUP "/group2" { } } } -h5dump error: unable to open datatype "/#5992:0" diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml index 1b3b1f0..b85bd5b 100644 --- a/tools/testfiles/tcompound.h5.xml +++ b/tools/testfiles/tcompound.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tcompound.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:NamedDataType Name="#6632:0" OBJ-XID="xid_4294967294-4294967293" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:NamedDataType Name="#6632" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int"> @@ -24,7 +24,7 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424-0" H5Path="/type1" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424" H5Path="/type1" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int_name"> @@ -44,7 +44,7 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792-0" H5Path="/type2" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792" H5Path="/type2" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int_array"> @@ -75,7 +75,7 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -121,8 +121,8 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name="group1" OBJ-XID="xid_2104-0" H5Path="/group1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592-0" H5Path="/group1/type3" Parents="xid_2104-0" H5ParentPaths="/group1"> + <hdf5:Group Name="group1" OBJ-XID="xid_2104" H5Path="/group1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592" H5Path="/group1/type3" Parents="xid_2104" H5ParentPaths="/group1"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int"> @@ -142,7 +142,7 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="dset2" OBJ-XID="xid_2152-0" H5Path= "/group1/dset2" Parents="xid_2104-0" H5ParentPaths="/group1"> + <hdf5:Dataset Name="dset2" OBJ-XID="xid_2152" H5Path= "/group1/dset2" Parents="xid_2104" H5ParentPaths="/group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -156,7 +156,7 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:Dimension DimSize="5" MaxDimSize="5"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_1424-0" H5Path="/type1" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_1424" H5Path="/type1" /> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> @@ -164,7 +164,7 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="dset3" OBJ-XID="xid_2872-0" H5Path= "/group1/dset3" Parents="xid_2104-0" H5ParentPaths="/group1"> + <hdf5:Dataset Name="dset3" OBJ-XID="xid_2872" H5Path= "/group1/dset3" Parents="xid_2104" H5ParentPaths="/group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -179,7 +179,7 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:Dimension DimSize="6" MaxDimSize="6"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_2792-0" H5Path="/type2" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_2792" H5Path="/type2" /> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> @@ -276,7 +276,7 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="dset4" OBJ-XID="xid_5672-0" H5Path= "/group1/dset4" Parents="xid_2104-0" H5ParentPaths="/group1"> + <hdf5:Dataset Name="dset4" OBJ-XID="xid_5672" H5Path= "/group1/dset4" Parents="xid_2104" H5ParentPaths="/group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -290,7 +290,7 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:Dimension DimSize="5" MaxDimSize="5"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_5592-0" H5Path="/group1/type3" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_5592" H5Path="/group1/type3" /> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> @@ -299,8 +299,8 @@ Expected output for 'h5dump --xml tcompound.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="group2" OBJ-XID="xid_6584-0" H5Path="/group2" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset5" OBJ-XID="xid_7040-0" H5Path= "/group2/dset5" Parents="xid_6584-0" H5ParentPaths="/group2"> + <hdf5:Group Name="group2" OBJ-XID="xid_6584" H5Path="/group2" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset5" OBJ-XID="xid_7040" H5Path= "/group2/dset5" Parents="xid_6584" H5ParentPaths="/group2"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -314,7 +314,7 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:Dimension DimSize="5" MaxDimSize="5"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_7040-0"/> + <hdf5:NamedDataTypePtr OBJ-XID="xid_7040"/> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/testfiles/tcompound2.h5.xml index c5293ae..a349866 100644 --- a/tools/testfiles/tcompound2.h5.xml +++ b/tools/testfiles/tcompound2.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tcompound2.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:NamedDataType Name="#9560:0" OBJ-XID="xid_4294967294-4294967293" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:NamedDataType Name="#9560" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int"> @@ -24,7 +24,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:NamedDataType Name="type1" OBJ-XID="xid_3280-0" H5Path="/type1" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:NamedDataType Name="type1" OBJ-XID="xid_3280" H5Path="/type1" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int_name"> @@ -44,7 +44,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:NamedDataType Name="type2" OBJ-XID="xid_6544-0" H5Path="/type2" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:NamedDataType Name="type2" OBJ-XID="xid_6544" H5Path="/type2" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int_array"> @@ -75,7 +75,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="2" /> @@ -125,8 +125,8 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name="group1" OBJ-XID="xid_3960-0" H5Path="/group1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:NamedDataType Name="type3" OBJ-XID="xid_6624-0" H5Path="/group1/type3" Parents="xid_3960-0" H5ParentPaths="/group1"> + <hdf5:Group Name="group1" OBJ-XID="xid_3960" H5Path="/group1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:NamedDataType Name="type3" OBJ-XID="xid_6624" H5Path="/group1/type3" Parents="xid_3960" H5ParentPaths="/group1"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="int"> @@ -146,7 +146,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="dset2" OBJ-XID="xid_4008-0" H5Path= "/group1/dset2" Parents="xid_3960-0" H5ParentPaths="/group1"> + <hdf5:Dataset Name="dset2" OBJ-XID="xid_4008" H5Path= "/group1/dset2" Parents="xid_3960" H5ParentPaths="/group1"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="2" /> @@ -164,7 +164,7 @@ Expected output for 'h5dump --xml tcompound2.h5' <hdf5:Dimension DimSize="6" MaxDimSize="10"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_3280-0" H5Path="/type1" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_3280" H5Path="/type1" /> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> @@ -172,7 +172,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="dset4" OBJ-XID="xid_6704-0" H5Path= "/group1/dset4" Parents="xid_3960-0" H5ParentPaths="/group1"> + <hdf5:Dataset Name="dset4" OBJ-XID="xid_6704" H5Path= "/group1/dset4" Parents="xid_3960" H5ParentPaths="/group1"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="2" /> @@ -190,7 +190,7 @@ Expected output for 'h5dump --xml tcompound2.h5' <hdf5:Dimension DimSize="6" MaxDimSize="10"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_6624-0" H5Path="/group1/type3" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_6624" H5Path="/group1/type3" /> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> @@ -199,8 +199,8 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="group2" OBJ-XID="xid_9512-0" H5Path="/group2" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset5" OBJ-XID="xid_9968-0" H5Path= "/group2/dset5" Parents="xid_9512-0" H5ParentPaths="/group2"> + <hdf5:Group Name="group2" OBJ-XID="xid_9512" H5Path="/group2" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset5" OBJ-XID="xid_9968" H5Path= "/group2/dset5" Parents="xid_9512" H5ParentPaths="/group2"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="2" /> @@ -218,7 +218,7 @@ Expected output for 'h5dump --xml tcompound2.h5' <hdf5:Dimension DimSize="6" MaxDimSize="10"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_9968-0"/> + <hdf5:NamedDataTypePtr OBJ-XID="xid_9968"/> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/testfiles/tdatareg.h5.xml index c285f85..789b0fa 100644 --- a/tools/testfiles/tdatareg.h5.xml +++ b/tools/testfiles/tdatareg.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tdatareg.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:Dataset Name="Dataset1" OBJ-XID="xid_1284-0" H5Path= "/Dataset1" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1284" H5Path= "/Dataset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -30,7 +30,7 @@ Expected output for 'h5dump --xml tdatareg.h5' <hdf5:NoData /> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_744-0" H5Path= "/Dataset2" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_744" H5Path= "/Dataset2" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tdset.h5.xml b/tools/testfiles/tdset.h5.xml index e86d6fa..54eedb4 100644 --- a/tools/testfiles/tdset.h5.xml +++ b/tools/testfiles/tdset.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tdset.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:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -39,7 +39,7 @@ Expected output for 'h5dump --xml tdset.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="dset2" OBJ-XID="xid_1984-0" H5Path= "/dset2" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="dset2" OBJ-XID="xid_1984" H5Path= "/dset2" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tdset2.h5.xml b/tools/testfiles/tdset2.h5.xml index d8ecec5..2d58988 100644 --- a/tools/testfiles/tdset2.h5.xml +++ b/tools/testfiles/tdset2.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tdset2.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:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="2"> <hdf5:ChunkDimension DimSize="5" /> @@ -44,7 +44,7 @@ Expected output for 'h5dump --xml tdset2.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="dset2" OBJ-XID="xid_3800-0" H5Path= "/dset2" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="dset2" OBJ-XID="xid_3800" H5Path= "/dset2" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="2"> <hdf5:ChunkDimension DimSize="5" /> diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/testfiles/tempty-dtd-2.h5.xml index 9f59b97..16483b7 100644 --- a/tools/testfiles/tempty-dtd-2.h5.xml +++ b/tools/testfiles/tempty-dtd-2.h5.xml @@ -4,8 +4,8 @@ Expected output for 'h5dump --xml -u tempty.h5' <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd"> <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="/"> +<RootGroup OBJ-XID="xid_928" H5Path="/"> + <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -35,7 +35,7 @@ Expected output for 'h5dump --xml -u tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -60,7 +60,7 @@ Expected output for 'h5dump --xml -u tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -85,7 +85,7 @@ Expected output for 'h5dump --xml -u tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -115,7 +115,7 @@ Expected output for 'h5dump --xml -u tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> diff --git a/tools/testfiles/tempty-dtd-uri.h5.xml b/tools/testfiles/tempty-dtd-uri.h5.xml index b3fb6a9..894e275 100644 --- a/tools/testfiles/tempty-dtd-uri.h5.xml +++ b/tools/testfiles/tempty-dtd-uri.h5.xml @@ -4,8 +4,8 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <?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="/"> +<RootGroup OBJ-XID="xid_928" H5Path="/"> + <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -35,7 +35,7 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -60,7 +60,7 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -85,7 +85,7 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -115,7 +115,7 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/testfiles/tempty-dtd.h5.xml index 76613f3..07950ca 100644 --- a/tools/testfiles/tempty-dtd.h5.xml +++ b/tools/testfiles/tempty-dtd.h5.xml @@ -4,8 +4,8 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd"> <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="/"> +<RootGroup OBJ-XID="xid_928" H5Path="/"> + <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -35,7 +35,7 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -60,7 +60,7 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -85,7 +85,7 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -115,7 +115,7 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/testfiles/tempty-nons-2.h5.xml index 1c1dd29..ed09103 100644 --- a/tools/testfiles/tempty-nons-2.h5.xml +++ b/tools/testfiles/tempty-nons-2.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' ############################# <?xml version="1.0" encoding="UTF-8"?> <HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd"> -<RootGroup OBJ-XID="xid_928-0" H5Path="/"> - <Dataset Name="Dataset1.0" OBJ-XID="xid_976-0" H5Path= "/Dataset1.0" Parents="xid_928-0" H5ParentPaths="/"> +<RootGroup OBJ-XID="xid_928" H5Path="/"> + <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -34,7 +34,7 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -59,7 +59,7 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -84,7 +84,7 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -114,7 +114,7 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> diff --git a/tools/testfiles/tempty-nons-uri.h5.xml b/tools/testfiles/tempty-nons-uri.h5.xml index 01f230a..046d5d6 100644 --- a/tools/testfiles/tempty-nons-uri.h5.xml +++ b/tools/testfiles/tempty-nons-uri.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp ############################# <?xml version="1.0" encoding="UTF-8"?> <HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://somewhere.net"> -<RootGroup OBJ-XID="xid_928-0" H5Path="/"> - <Dataset Name="Dataset1.0" OBJ-XID="xid_976-0" H5Path= "/Dataset1.0" Parents="xid_928-0" H5ParentPaths="/"> +<RootGroup OBJ-XID="xid_928" H5Path="/"> + <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -34,7 +34,7 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -59,7 +59,7 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -84,7 +84,7 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -114,7 +114,7 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/testfiles/tempty-nons.h5.xml index 0179122..93cd578 100644 --- a/tools/testfiles/tempty-nons.h5.xml +++ b/tools/testfiles/tempty-nons.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml -X : tempty.h5' ############################# <?xml version="1.0" encoding="UTF-8"?> <HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd"> -<RootGroup OBJ-XID="xid_928-0" H5Path="/"> - <Dataset Name="Dataset1.0" OBJ-XID="xid_976-0" H5Path= "/Dataset1.0" Parents="xid_928-0" H5ParentPaths="/"> +<RootGroup OBJ-XID="xid_928" H5Path="/"> + <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -34,7 +34,7 @@ Expected output for 'h5dump --xml -X : tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -59,7 +59,7 @@ Expected output for 'h5dump --xml -X : tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -84,7 +84,7 @@ Expected output for 'h5dump --xml -X : tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> @@ -114,7 +114,7 @@ Expected output for 'h5dump --xml -X : tempty.h5' </DataFromFile> </Data> </Dataset> - <Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/"> + <Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/testfiles/tempty-ns-2.h5.xml index 432b781..148c59f 100644 --- a/tools/testfiles/tempty-ns-2.h5.xml +++ b/tools/testfiles/tempty-ns-2.h5.xml @@ -3,8 +3,8 @@ 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:RootGroup OBJ-XID="xid_928" H5Path="/"> + <thing:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -34,7 +34,7 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </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:Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -59,7 +59,7 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </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:Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -84,7 +84,7 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </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:Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -114,7 +114,7 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </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:Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/testfiles/tempty-ns.h5.xml index 354bdc2..a3adb78 100644 --- a/tools/testfiles/tempty-ns.h5.xml +++ b/tools/testfiles/tempty-ns.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml -X 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:RootGroup OBJ-XID="xid_928" H5Path="/"> + <thing:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -34,7 +34,7 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </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:Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -59,7 +59,7 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </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:Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -84,7 +84,7 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </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:Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> @@ -114,7 +114,7 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </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:Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> diff --git a/tools/testfiles/tempty.h5.xml b/tools/testfiles/tempty.h5.xml index 6ba1f38..4651471 100644 --- a/tools/testfiles/tempty.h5.xml +++ b/tools/testfiles/tempty.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tempty.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976-0" H5Path= "/Dataset1.0" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -34,7 +34,7 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -59,7 +59,7 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset3.0" OBJ-XID="xid_2128-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset3.0" OBJ-XID="xid_2128" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -84,7 +84,7 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset4.0" OBJ-XID="xid_2400-0" H5Path= "/Dataset4.0" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset4.0" OBJ-XID="xid_2400" H5Path= "/Dataset4.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -114,7 +114,7 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset5.0" OBJ-XID="xid_2672-0" H5Path= "/Dataset5.0" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset5.0" OBJ-XID="xid_2672" H5Path= "/Dataset5.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tenum.h5.xml b/tools/testfiles/tenum.h5.xml index 2a4be7c..196b655 100644 --- a/tools/testfiles/tenum.h5.xml +++ b/tools/testfiles/tenum.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tenum.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:NamedDataType Name="enum normal" OBJ-XID="xid_744-0" H5Path="/enum normal" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:NamedDataType Name="enum normal" OBJ-XID="xid_744" H5Path="/enum normal" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> <hdf5:AtomicType> <hdf5:EnumType Nelems="5"> @@ -47,7 +47,7 @@ Expected output for 'h5dump --xml tenum.h5' </hdf5:AtomicType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="table" OBJ-XID="xid_1152-0" H5Path= "/table" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="table" OBJ-XID="xid_1152" H5Path= "/table" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -61,7 +61,7 @@ Expected output for 'h5dump --xml tenum.h5' <hdf5:Dimension DimSize="20" MaxDimSize="20"/> </hdf5:SimpleDataspace> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_744-0" H5Path="/enum normal" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_744" H5Path="/enum normal" /> <hdf5:Data> <hdf5:DataFromFile> RED GREEN BLUE GREEN WHITE WHITE BLACK GREEN BLUE RED RED BLUE GREEN diff --git a/tools/testfiles/tgroup.h5.xml b/tools/testfiles/tgroup.h5.xml index a704dbd..c6f8f73 100644 --- a/tools/testfiles/tgroup.h5.xml +++ b/tools/testfiles/tgroup.h5.xml @@ -3,31 +3,31 @@ Expected output for 'h5dump --xml tgroup.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:Group Name="g1" OBJ-XID="xid_1344-0" H5Path="/g1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Group Name="g1.1" OBJ-XID="xid_3616-0" H5Path="/g1/g1.1" Parents="xid_1344-0" H5ParentPaths="/g1" > +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g1.1" OBJ-XID="xid_3616" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > </hdf5:Group> - <hdf5:Group Name="g1.2" OBJ-XID="xid_4592-0" H5Path="/g1/g1.2" Parents="xid_1344-0" H5ParentPaths="/g1" > + <hdf5:Group Name="g1.2" OBJ-XID="xid_4592" H5Path="/g1/g1.2" Parents="xid_1344" H5ParentPaths="/g1" > </hdf5:Group> </hdf5:Group> - <hdf5:Group Name="g2" OBJ-XID="xid_2320-0" H5Path="/g2" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Group Name="g2.1" OBJ-XID="xid_5240-0" H5Path="/g2/g2.1" Parents="xid_2320-0" H5ParentPaths="/g2" > - <hdf5:Group Name="g2.1.1" OBJ-XID="xid_9136-0" H5Path="/g2/g2.1/g2.1.1" Parents="xid_5240-0" H5ParentPaths="/g2/g2.1" > + <hdf5:Group Name="g2" OBJ-XID="xid_2320" H5Path="/g2" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g2.1" OBJ-XID="xid_5240" H5Path="/g2/g2.1" Parents="xid_2320" H5ParentPaths="/g2" > + <hdf5:Group Name="g2.1.1" OBJ-XID="xid_9136" H5Path="/g2/g2.1/g2.1.1" Parents="xid_5240" H5ParentPaths="/g2/g2.1" > </hdf5:Group> - <hdf5:Group Name="g2.1.2" OBJ-XID="xid_10112-0" H5Path="/g2/g2.1/g2.1.2" Parents="xid_5240-0" H5ParentPaths="/g2/g2.1" > + <hdf5:Group Name="g2.1.2" OBJ-XID="xid_10112" H5Path="/g2/g2.1/g2.1.2" Parents="xid_5240" H5ParentPaths="/g2/g2.1" > </hdf5:Group> - <hdf5:Group Name="g2.1.3" OBJ-XID="xid_10760-0" H5Path="/g2/g2.1/g2.1.3" Parents="xid_5240-0" H5ParentPaths="/g2/g2.1" > + <hdf5:Group Name="g2.1.3" OBJ-XID="xid_10760" H5Path="/g2/g2.1/g2.1.3" Parents="xid_5240" H5ParentPaths="/g2/g2.1" > </hdf5:Group> </hdf5:Group> </hdf5:Group> - <hdf5:Group Name="g3" OBJ-XID="xid_2968-0" H5Path="/g3" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Group Name="g3.1" OBJ-XID="xid_6216-0" H5Path="/g3/g3.1" Parents="xid_2968-0" H5ParentPaths="/g3" > + <hdf5:Group Name="g3" OBJ-XID="xid_2968" H5Path="/g3" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g3.1" OBJ-XID="xid_6216" H5Path="/g3/g3.1" Parents="xid_2968" H5ParentPaths="/g3" > </hdf5:Group> - <hdf5:Group Name="g3.2" OBJ-XID="xid_7192-0" H5Path="/g3/g3.2" Parents="xid_2968-0" H5ParentPaths="/g3" > + <hdf5:Group Name="g3.2" OBJ-XID="xid_7192" H5Path="/g3/g3.2" Parents="xid_2968" H5ParentPaths="/g3" > </hdf5:Group> - <hdf5:Group Name="g3.3" OBJ-XID="xid_7840-0" H5Path="/g3/g3.3" Parents="xid_2968-0" H5ParentPaths="/g3" > + <hdf5:Group Name="g3.3" OBJ-XID="xid_7840" H5Path="/g3/g3.3" Parents="xid_2968" H5ParentPaths="/g3" > </hdf5:Group> - <hdf5:Group Name="g3.4" OBJ-XID="xid_8488-0" H5Path="/g3/g3.4" Parents="xid_2968-0" H5ParentPaths="/g3" > + <hdf5:Group Name="g3.4" OBJ-XID="xid_8488" H5Path="/g3/g3.4" Parents="xid_2968" H5ParentPaths="/g3" > </hdf5:Group> </hdf5:Group> </hdf5:RootGroup> diff --git a/tools/testfiles/thlink.h5.xml b/tools/testfiles/thlink.h5.xml index 01e1031..4455d1b 100644 --- a/tools/testfiles/thlink.h5.xml +++ b/tools/testfiles/thlink.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml thlink.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:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -29,18 +29,18 @@ Expected output for 'h5dump --xml thlink.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name="g1" OBJ-XID="xid_1804-0" H5Path="/g1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset2" OBJ-XID="xid_744-0-1" H5Path="/g1/dset2" Parents="xid_1804-0" H5ParentPaths="/g1"> - <hdf5:DatasetPtr OBJ-XID="xid_744-0" H5Path="/g1/dset2"/> + <hdf5:Group Name="g1" OBJ-XID="xid_1804" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset2" OBJ-XID="xid_744-1" H5Path="/g1/dset2" Parents="xid_1804" H5ParentPaths="/g1"> + <hdf5:DatasetPtr OBJ-XID="xid_744" H5Path="/g1/dset2"/> </hdf5:Dataset> - <hdf5:Group Name="g1.1" OBJ-XID="xid_2780-0" H5Path="/g1/g1.1" Parents="xid_1804-0" H5ParentPaths="/g1" > - <hdf5:Dataset Name="dset3" OBJ-XID="xid_744-0-2" H5Path="/g1/g1.1/dset3" Parents="xid_2780-0" H5ParentPaths="/g1/g1.1"> - <hdf5:DatasetPtr OBJ-XID="xid_744-0" H5Path="/g1/g1.1/dset3"/> + <hdf5:Group Name="g1.1" OBJ-XID="xid_2780" H5Path="/g1/g1.1" Parents="xid_1804" H5ParentPaths="/g1" > + <hdf5:Dataset Name="dset3" OBJ-XID="xid_744-2" H5Path="/g1/g1.1/dset3" Parents="xid_2780" H5ParentPaths="/g1/g1.1"> + <hdf5:DatasetPtr OBJ-XID="xid_744" H5Path="/g1/g1.1/dset3"/> </hdf5:Dataset> </hdf5:Group> </hdf5:Group> - <hdf5:Group Name="g2" OBJ-XID="xid_2780-0-3" H5Path="/g1/g1.1" Parents="xid_696-0" H5ParentPaths="/"> - <hdf5:GroupPtr OBJ-XID="xid_2780-0" H5Path="/g1/g1.1" Parents="xid_696-0" H5ParentPaths="/" /> + <hdf5:Group Name="g2" OBJ-XID="xid_2780-3" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/"> + <hdf5:GroupPtr OBJ-XID="xid_2780" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/" /> </hdf5:Group> </hdf5:RootGroup> </hdf5:HDF5-File> diff --git a/tools/testfiles/tloop.h5.xml b/tools/testfiles/tloop.h5.xml index f5f08b7..28e50a2 100644 --- a/tools/testfiles/tloop.h5.xml +++ b/tools/testfiles/tloop.h5.xml @@ -3,16 +3,16 @@ Expected output for 'h5dump --xml tloop.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:Group Name="g1" OBJ-XID="xid_1344-0" H5Path="/g1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Group Name="g1.1" OBJ-XID="xid_2320-0" H5Path="/g1/g1.1" Parents="xid_1344-0" H5ParentPaths="/g1" > - <hdf5:Group Name="g2.1" OBJ-XID="xid_1344-0-1" H5Path="/g1" Parents="xid_2320-0" H5ParentPaths="/g1/g1.1"> - <hdf5:GroupPtr OBJ-XID="xid_1344-0" H5Path="/g1" Parents="xid_2320-0" H5ParentPaths="/g1/g1.1" /> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g1.1" OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:Group Name="g2.1" OBJ-XID="xid_1344-1" H5Path="/g1" Parents="xid_2320" H5ParentPaths="/g1/g1.1"> + <hdf5:GroupPtr OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_2320" H5ParentPaths="/g1/g1.1" /> </hdf5:Group> </hdf5:Group> </hdf5:Group> - <hdf5:Group Name="g2" OBJ-XID="xid_2320-0-2" H5Path="/g1/g1.1" Parents="xid_696-0" H5ParentPaths="/"> - <hdf5:GroupPtr OBJ-XID="xid_2320-0" H5Path="/g1/g1.1" Parents="xid_696-0" H5ParentPaths="/" /> + <hdf5:Group Name="g2" OBJ-XID="xid_2320-2" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/"> + <hdf5:GroupPtr OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/" /> </hdf5:Group> </hdf5:RootGroup> </hdf5:HDF5-File> diff --git a/tools/testfiles/tloop2.h5.xml b/tools/testfiles/tloop2.h5.xml index 3129773..b489a68 100644 --- a/tools/testfiles/tloop2.h5.xml +++ b/tools/testfiles/tloop2.h5.xml @@ -3,14 +3,14 @@ Expected output for 'h5dump --xml tloop2.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:Group Name="g1" OBJ-XID="xid_1344-0" H5Path="/g1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Group Name="g1.1" OBJ-XID="xid_2320-0" H5Path="/g1/g1.1" Parents="xid_1344-0" H5ParentPaths="/g1" > - <hdf5:SoftLink LinkName="g2.1" OBJ-XID="xid_4294967294-4294967293" H5SourcePath="/g1/g1.1/g2.1" TargetPath="/g1" TargetObj="xid_1344-0" Parents="xid_2320-0" H5ParentPaths="/g1/g1.1" /> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g1.1" OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:SoftLink LinkName="g2.1" OBJ-XID="xid_1344" H5SourcePath="/g1/g1.1/g2.1" TargetPath="/g1" TargetObj="xid_1344" Parents="xid_2320" H5ParentPaths="/g1/g1.1" /> </hdf5:Group> </hdf5:Group> - <hdf5:Group Name="g2" OBJ-XID="xid_2320-0-1" H5Path="/g1/g1.1" Parents="xid_696-0" H5ParentPaths="/"> - <hdf5:GroupPtr OBJ-XID="xid_2320-0" H5Path="/g1/g1.1" Parents="xid_696-0" H5ParentPaths="/" /> + <hdf5:Group Name="g2" OBJ-XID="xid_2320-1" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/"> + <hdf5:GroupPtr OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/" /> </hdf5:Group> </hdf5:RootGroup> </hdf5:HDF5-File> diff --git a/tools/testfiles/tmany.h5.xml b/tools/testfiles/tmany.h5.xml index f8d3110..321c978 100644 --- a/tools/testfiles/tmany.h5.xml +++ b/tools/testfiles/tmany.h5.xml @@ -3,10 +3,10 @@ Expected output for 'h5dump --xml tmany.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:Group Name="g1" OBJ-XID="xid_1344-0" H5Path="/g1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Group Name="g1.1" OBJ-XID="xid_2320-0" H5Path="/g1/g1.1" Parents="xid_1344-0" H5ParentPaths="/g1" > - <hdf5:Dataset Name="dset1" OBJ-XID="xid_2696-0" H5Path= "/g1/g1.1/dset1" Parents="xid_2320-0" H5ParentPaths="/g1/g1.1"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="g1.1" OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:Dataset Name="dset1" OBJ-XID="xid_2696" H5Path= "/g1/g1.1/dset1" Parents="xid_2320" H5ParentPaths="/g1/g1.1"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="2" /> @@ -265,17 +265,17 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g1.2" OBJ-XID="xid_5832-0" H5Path="/g1/g1.2" Parents="xid_1344-0" H5ParentPaths="/g1" > - <hdf5:Dataset Name="link1" OBJ-XID="xid_2696-0-1" H5Path="/g1/g1.2/link1" Parents="xid_5832-0" H5ParentPaths="/g1/g1.2"> - <hdf5:DatasetPtr OBJ-XID="xid_2696-0" H5Path="/g1/g1.2/link1"/> + <hdf5:Group Name="g1.2" OBJ-XID="xid_5832" H5Path="/g1/g1.2" Parents="xid_1344" H5ParentPaths="/g1" > + <hdf5:Dataset Name="link1" OBJ-XID="xid_2696-1" H5Path="/g1/g1.2/link1" Parents="xid_5832" H5ParentPaths="/g1/g1.2"> + <hdf5:DatasetPtr OBJ-XID="xid_2696" H5Path="/g1/g1.2/link1"/> </hdf5:Dataset> </hdf5:Group> </hdf5:Group> - <hdf5:Group Name="g2" OBJ-XID="xid_6808-0" H5Path="/g2" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_4294967294-4294967293" H5SourcePath="/g2/slink2" TargetPath="/g1" TargetObj="xid_1344-0" Parents="xid_6808-0" H5ParentPaths="/g2" /> + <hdf5:Group Name="g2" OBJ-XID="xid_6808" H5Path="/g2" Parents="xid_696" H5ParentPaths="/" > + <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_1344" H5SourcePath="/g2/slink2" TargetPath="/g1" TargetObj="xid_1344" Parents="xid_6808" H5ParentPaths="/g2" /> </hdf5:Group> - <hdf5:Group Name="g3" OBJ-XID="xid_7784-0" H5Path="/g3" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="link3" OBJ-XID="xid_8480-0" H5Path= "/g3/link3" Parents="xid_7784-0" H5ParentPaths="/g3"> + <hdf5:Group Name="g3" OBJ-XID="xid_7784" H5Path="/g3" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="link3" OBJ-XID="xid_8480" H5Path= "/g3/link3" Parents="xid_7784" H5ParentPaths="/g3"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -311,16 +311,16 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g4" OBJ-XID="xid_8432-0" H5Path="/g4" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset2" OBJ-XID="xid_8480-0-2" H5Path="/g4/dset2" Parents="xid_8432-0" H5ParentPaths="/g4"> - <hdf5:DatasetPtr OBJ-XID="xid_8480-0" H5Path="/g4/dset2"/> + <hdf5:Group Name="g4" OBJ-XID="xid_8432" H5Path="/g4" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset2" OBJ-XID="xid_8480-2" H5Path="/g4/dset2" Parents="xid_8432" H5ParentPaths="/g4"> + <hdf5:DatasetPtr OBJ-XID="xid_8480" H5Path="/g4/dset2"/> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g5" OBJ-XID="xid_10248-0" H5Path="/g5" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:SoftLink LinkName="slink4" OBJ-XID="xid_4294967292-4294967291" H5SourcePath="/g5/slink4" TargetPath="/g6/dset3" TargetObj="xid_10944-0" Parents="xid_10248-0" H5ParentPaths="/g5" /> + <hdf5:Group Name="g5" OBJ-XID="xid_10248" H5Path="/g5" Parents="xid_696" H5ParentPaths="/" > + <hdf5:SoftLink LinkName="slink4" OBJ-XID="xid_10944" H5SourcePath="/g5/slink4" TargetPath="/g6/dset3" TargetObj="xid_10944" Parents="xid_10248" H5ParentPaths="/g5" /> </hdf5:Group> - <hdf5:Group Name="g6" OBJ-XID="xid_10896-0" H5Path="/g6" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset3" OBJ-XID="xid_10944-0" H5Path= "/g6/dset3" Parents="xid_10896-0" H5ParentPaths="/g6"> + <hdf5:Group Name="g6" OBJ-XID="xid_10896" H5Path="/g6" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset3" OBJ-XID="xid_10944" H5Path= "/g6/dset3" Parents="xid_10896" H5ParentPaths="/g6"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tname-amp.h5.xml b/tools/testfiles/tname-amp.h5.xml index e723cdb..47ed578 100644 --- a/tools/testfiles/tname-amp.h5.xml +++ b/tools/testfiles/tname-amp.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tname-amp.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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1&withamp"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -21,8 +21,8 @@ Expected output for 'h5dump --xml tname-amp.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Group Name="g1.1&withamp" OBJ-XID="xid_1344-0" H5Path="/g1.1&withamp" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset1.1.1&withamp" OBJ-XID="xid_1720-0" H5Path= "/g1.1&withamp/dset1.1.1&withamp" Parents="xid_1344-0" H5ParentPaths="/g1.1&withamp"> + <hdf5:Group Name="g1.1&withamp" OBJ-XID="xid_1344" H5Path="/g1.1&withamp" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset1.1.1&withamp" OBJ-XID="xid_1720" H5Path= "/g1.1&withamp/dset1.1.1&withamp" Parents="xid_1344" H5ParentPaths="/g1.1&withamp"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tname-apos.h5.xml b/tools/testfiles/tname-apos.h5.xml index 384fa21..16184de 100644 --- a/tools/testfiles/tname-apos.h5.xml +++ b/tools/testfiles/tname-apos.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tname-apos.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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1'withapos"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -21,8 +21,8 @@ Expected output for 'h5dump --xml tname-apos.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Group Name="g1.1'withapos" OBJ-XID="xid_1344-0" H5Path="/g1.1'withapos" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset1.1.1'withapos" OBJ-XID="xid_1720-0" H5Path= "/g1.1'withapos/dset1.1.1'withapos" Parents="xid_1344-0" H5ParentPaths="/g1.1'withapos"> + <hdf5:Group Name="g1.1'withapos" OBJ-XID="xid_1344" H5Path="/g1.1'withapos" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset1.1.1'withapos" OBJ-XID="xid_1720" H5Path= "/g1.1'withapos/dset1.1.1'withapos" Parents="xid_1344" H5ParentPaths="/g1.1'withapos"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tname-gt.h5.xml b/tools/testfiles/tname-gt.h5.xml index b1a0ff7..b651c42 100644 --- a/tools/testfiles/tname-gt.h5.xml +++ b/tools/testfiles/tname-gt.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tname-gt.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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1>withgt"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -21,8 +21,8 @@ Expected output for 'h5dump --xml tname-gt.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Group Name="g1.1>withgt" OBJ-XID="xid_1344-0" H5Path="/g1.1>withgt" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset1.1.1>withgt" OBJ-XID="xid_1720-0" H5Path= "/g1.1>withgt/dset1.1.1>withgt" Parents="xid_1344-0" H5ParentPaths="/g1.1>withgt"> + <hdf5:Group Name="g1.1>withgt" OBJ-XID="xid_1344" H5Path="/g1.1>withgt" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset1.1.1>withgt" OBJ-XID="xid_1720" H5Path= "/g1.1>withgt/dset1.1.1>withgt" Parents="xid_1344" H5ParentPaths="/g1.1>withgt"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tname-lt.h5.xml b/tools/testfiles/tname-lt.h5.xml index c9dd6c8..29bf64e 100644 --- a/tools/testfiles/tname-lt.h5.xml +++ b/tools/testfiles/tname-lt.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tname-lt.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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1<withlt"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -21,8 +21,8 @@ Expected output for 'h5dump --xml tname-lt.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Group Name="g1.1<withlt" OBJ-XID="xid_1344-0" H5Path="/g1.1<withlt" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset1.1.1<withlt" OBJ-XID="xid_1720-0" H5Path= "/g1.1<withlt/dset1.1.1<withlt" Parents="xid_1344-0" H5ParentPaths="/g1.1<withlt"> + <hdf5:Group Name="g1.1<withlt" OBJ-XID="xid_1344" H5Path="/g1.1<withlt" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset1.1.1<withlt" OBJ-XID="xid_1720" H5Path= "/g1.1<withlt/dset1.1.1<withlt" Parents="xid_1344" H5ParentPaths="/g1.1<withlt"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tname-quot.h5.xml b/tools/testfiles/tname-quot.h5.xml index 57e91c6..99ce59f 100644 --- a/tools/testfiles/tname-quot.h5.xml +++ b/tools/testfiles/tname-quot.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tname-quot.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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1"withquot"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -21,8 +21,8 @@ Expected output for 'h5dump --xml tname-quot.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Group Name="g1.1"withquot" OBJ-XID="xid_1344-0" H5Path="/g1.1"withquot" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset1.1.1"withquot" OBJ-XID="xid_1720-0" H5Path= "/g1.1"withquot/dset1.1.1"withquot" Parents="xid_1344-0" H5ParentPaths="/g1.1"withquot"> + <hdf5:Group Name="g1.1"withquot" OBJ-XID="xid_1344" H5Path="/g1.1"withquot" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset1.1.1"withquot" OBJ-XID="xid_1720" H5Path= "/g1.1"withquot/dset1.1.1"withquot" Parents="xid_1344" H5ParentPaths="/g1.1"withquot"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tname-sp.h5.xml b/tools/testfiles/tname-sp.h5.xml index 2733564..d24cddb 100644 --- a/tools/testfiles/tname-sp.h5.xml +++ b/tools/testfiles/tname-sp.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tname-sp.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:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1 withspace"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> @@ -21,8 +21,8 @@ Expected output for 'h5dump --xml tname-sp.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Group Name="g1.1 withspace" OBJ-XID="xid_1344-0" H5Path="/g1.1 withspace" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset1.1.1 withspace" OBJ-XID="xid_1720-0" H5Path= "/g1.1 withspace/dset1.1.1 withspace" Parents="xid_1344-0" H5ParentPaths="/g1.1 withspace"> + <hdf5:Group Name="g1.1 withspace" OBJ-XID="xid_1344" H5Path="/g1.1 withspace" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset1.1.1 withspace" OBJ-XID="xid_1720" H5Path= "/g1.1 withspace/dset1.1.1 withspace" Parents="xid_1344" H5ParentPaths="/g1.1 withspace"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/testfiles/tnestedcomp.h5.xml index a2963c8..64947f6 100644 --- a/tools/testfiles/tnestedcomp.h5.xml +++ b/tools/testfiles/tnestedcomp.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tnestedcomp.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:Dataset Name="ArrayOfStructures" OBJ-XID="xid_744-0" H5Path= "/ArrayOfStructures" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="ArrayOfStructures" OBJ-XID="xid_744" H5Path= "/ArrayOfStructures" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tnodata.h5.xml b/tools/testfiles/tnodata.h5.xml index 1e390c3..8867b2b 100644 --- a/tools/testfiles/tnodata.h5.xml +++ b/tools/testfiles/tnodata.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tnodata.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:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl index 644bca5..e4fd1dd 100644 --- a/tools/testfiles/tnofilename.ddl +++ b/tools/testfiles/tnofilename.ddl @@ -18,8 +18,8 @@ usage: h5dump [OPTIONS] file -o F, --output=F Output raw data into file F -t P, --datatype=P Print the specified named data type -w N, --width=N Set the number of columns of output - -x, --xml Output in XML using Schema (default) - -u, --use-dtd Output in XML using DTD + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD -D U, --xml-dtd=U Use the DTD or schema at U -X S, --xml-ns=S (XML Schema) Use qualified names n the XML ":": no namespace, default: "hdf5:" diff --git a/tools/testfiles/tobjref.h5.xml b/tools/testfiles/tobjref.h5.xml index 09d33a1..f50855c 100644 --- a/tools/testfiles/tobjref.h5.xml +++ b/tools/testfiles/tobjref.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tobjref.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:Dataset Name="Dataset3" OBJ-XID="xid_2348-0" H5Path= "/Dataset3" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="Dataset3" OBJ-XID="xid_2348" H5Path= "/Dataset3" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -34,8 +34,8 @@ Expected output for 'h5dump --xml tobjref.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name="Group1" OBJ-XID="xid_1320-0" H5Path="/Group1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:NamedDataType Name="Datatype1" OBJ-XID="xid_2268-0" H5Path="/Group1/Datatype1" Parents="xid_1320-0" H5ParentPaths="/Group1"> + <hdf5:Group Name="Group1" OBJ-XID="xid_1320" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:NamedDataType Name="Datatype1" OBJ-XID="xid_2268" H5Path="/Group1/Datatype1" Parents="xid_1320" H5ParentPaths="/Group1"> <hdf5:DataType> <hdf5:CompoundType> <hdf5:Field FieldName="a"> @@ -62,7 +62,7 @@ Expected output for 'h5dump --xml tobjref.h5' </hdf5:CompoundType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1696-0" H5Path= "/Group1/Dataset1" Parents="xid_1320-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1696" H5Path= "/Group1/Dataset1" Parents="xid_1320" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -87,7 +87,7 @@ Expected output for 'h5dump --xml tobjref.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_2152-0" H5Path= "/Group1/Dataset2" Parents="xid_1320-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_2152" H5Path= "/Group1/Dataset2" Parents="xid_1320" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/topaque.h5.xml b/tools/testfiles/topaque.h5.xml index 6172e77..1d047b0 100644 --- a/tools/testfiles/topaque.h5.xml +++ b/tools/testfiles/topaque.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml topaque.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:Dataset Name="opaque test" OBJ-XID="xid_744-0" H5Path= "/opaque test" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="opaque test" OBJ-XID="xid_744" H5Path= "/opaque test" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/testfiles/tref-escapes-at.h5.xml index 72d91f8..405f652 100644 --- a/tools/testfiles/tref-escapes-at.h5.xml +++ b/tools/testfiles/tref-escapes-at.h5.xml @@ -3,9 +3,9 @@ Expected output for 'h5dump --xml tref-escapes-at.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:Group Name="Group1" OBJ-XID="xid_1344-0" H5Path="/Group1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_3716-0" H5Path= "/Group1/Dataset space" Parents="xid_1344-0" H5ParentPaths="/Group1"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_3716" H5Path= "/Group1/Dataset space" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -30,7 +30,7 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset"quote" OBJ-XID="xid_1720-0" H5Path= "/Group1/Dataset"quote" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset"quote" OBJ-XID="xid_1720" H5Path= "/Group1/Dataset"quote" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -55,7 +55,7 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset&amp" OBJ-XID="xid_2612-0" H5Path= "/Group1/Dataset&amp" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset&amp" OBJ-XID="xid_2612" H5Path= "/Group1/Dataset&amp" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -80,7 +80,7 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset'apos" OBJ-XID="xid_3440-0" H5Path= "/Group1/Dataset'apos" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset'apos" OBJ-XID="xid_3440" H5Path= "/Group1/Dataset'apos" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -105,7 +105,7 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset<lt" OBJ-XID="xid_2888-0" H5Path= "/Group1/Dataset<lt" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset<lt" OBJ-XID="xid_2888" H5Path= "/Group1/Dataset<lt" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -130,7 +130,7 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset>gt" OBJ-XID="xid_3164-0" H5Path= "/Group1/Dataset>gt" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset>gt" OBJ-XID="xid_3164" H5Path= "/Group1/Dataset>gt" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -155,7 +155,7 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset\slash" OBJ-XID="xid_2336-0" H5Path= "/Group1/Dataset\slash" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset\slash" OBJ-XID="xid_2336" H5Path= "/Group1/Dataset\slash" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -180,8 +180,8 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name="Group1.1" OBJ-XID="xid_4592-0" H5Path="/Group1/Group1.1" Parents="xid_1344-0" H5ParentPaths="/Group1" > - <hdf5:Dataset Name="Datasetrefs" OBJ-XID="xid_4640-0" H5Path= "/Group1/Group1.1/Datasetrefs" Parents="xid_4592-0" H5ParentPaths="/Group1/Group1.1"> + <hdf5:Group Name="Group1.1" OBJ-XID="xid_4592" H5Path="/Group1/Group1.1" Parents="xid_1344" H5ParentPaths="/Group1" > + <hdf5:Dataset Name="Datasetrefs" OBJ-XID="xid_4640" H5Path= "/Group1/Group1.1/Datasetrefs" Parents="xid_4592" H5ParentPaths="/Group1/Group1.1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/testfiles/tref-escapes.h5.xml index 7d7606a..e7b5f04 100644 --- a/tools/testfiles/tref-escapes.h5.xml +++ b/tools/testfiles/tref-escapes.h5.xml @@ -3,9 +3,9 @@ Expected output for 'h5dump --xml tref-escapes.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:Group Name="Group1" OBJ-XID="xid_1344-0" H5Path="/Group1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_1720-0" H5Path= "/Group1/Dataset space" Parents="xid_1344-0" H5ParentPaths="/Group1"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_1720" H5Path= "/Group1/Dataset space" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -30,7 +30,7 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset"quote" OBJ-XID="xid_2324-0" H5Path= "/Group1/Dataset"quote" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset"quote" OBJ-XID="xid_2324" H5Path= "/Group1/Dataset"quote" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -55,7 +55,7 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset&amp" OBJ-XID="xid_2612-0" H5Path= "/Group1/Dataset&amp" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset&amp" OBJ-XID="xid_2612" H5Path= "/Group1/Dataset&amp" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -80,7 +80,7 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset'apos" OBJ-XID="xid_2888-0" H5Path= "/Group1/Dataset'apos" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset'apos" OBJ-XID="xid_2888" H5Path= "/Group1/Dataset'apos" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -105,7 +105,7 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset<lt" OBJ-XID="xid_3164-0" H5Path= "/Group1/Dataset<lt" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset<lt" OBJ-XID="xid_3164" H5Path= "/Group1/Dataset<lt" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -130,7 +130,7 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset>gt" OBJ-XID="xid_3440-0" H5Path= "/Group1/Dataset>gt" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset>gt" OBJ-XID="xid_3440" H5Path= "/Group1/Dataset>gt" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -155,7 +155,7 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset\slash" OBJ-XID="xid_3716-0" H5Path= "/Group1/Dataset\slash" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset\slash" OBJ-XID="xid_3716" H5Path= "/Group1/Dataset\slash" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -180,8 +180,8 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name="Group1.1" OBJ-XID="xid_4592-0" H5Path="/Group1/Group1.1" Parents="xid_1344-0" H5ParentPaths="/Group1" > - <hdf5:Dataset Name="Datasetrefs" OBJ-XID="xid_4640-0" H5Path= "/Group1/Group1.1/Datasetrefs" Parents="xid_4592-0" H5ParentPaths="/Group1/Group1.1"> + <hdf5:Group Name="Group1.1" OBJ-XID="xid_4592" H5Path="/Group1/Group1.1" Parents="xid_1344" H5ParentPaths="/Group1" > + <hdf5:Dataset Name="Datasetrefs" OBJ-XID="xid_4640" H5Path= "/Group1/Group1.1/Datasetrefs" Parents="xid_4592" H5ParentPaths="/Group1/Group1.1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tref.h5.xml b/tools/testfiles/tref.h5.xml index e82e2ee..33f08a0 100644 --- a/tools/testfiles/tref.h5.xml +++ b/tools/testfiles/tref.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tref.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:Dataset Name="ZZZDataset3" OBJ-XID="xid_2612-0" H5Path= "/ZZZDataset3" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="ZZZDataset3" OBJ-XID="xid_2612" H5Path= "/ZZZDataset3" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -33,8 +33,8 @@ Expected output for 'h5dump --xml tref.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name="Group1" OBJ-XID="xid_1344-0" H5Path="/Group1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1720-0" H5Path= "/Group1/Dataset1" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1720" H5Path= "/Group1/Dataset1" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -59,7 +59,7 @@ Expected output for 'h5dump --xml tref.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_2336-0" H5Path= "/Group1/Dataset2" Parents="xid_1344-0" H5ParentPaths="/Group1"> + <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_2336" H5Path= "/Group1/Dataset2" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tsaf.h5.xml b/tools/testfiles/tsaf.h5.xml index ea33d60..0a5d89f 100644 --- a/tools/testfiles/tsaf.h5.xml +++ b/tools/testfiles/tsaf.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tsaf.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:Dataset Name=".DSL_METADATA" OBJ-XID="xid_744-0" H5Path= "/.DSL_METADATA" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name=".DSL_METADATA" OBJ-XID="xid_744" H5Path= "/.DSL_METADATA" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -314,7 +314,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Blob" OBJ-XID="xid_17612-0" H5Path= "/Blob" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Blob" OBJ-XID="xid_17612" H5Path= "/Blob" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -397,7 +397,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Cat" OBJ-XID="xid_169596-0" H5Path= "/Cat" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Cat" OBJ-XID="xid_169596" H5Path= "/Cat" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -546,7 +546,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Collection" OBJ-XID="xid_425460-0" H5Path= "/Collection" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Collection" OBJ-XID="xid_425460" H5Path= "/Collection" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -772,7 +772,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Field" OBJ-XID="xid_619980-0" H5Path= "/Field" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Field" OBJ-XID="xid_619980" H5Path= "/Field" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -1048,7 +1048,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="FieldTmpl" OBJ-XID="xid_518404-0" H5Path= "/FieldTmpl" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="FieldTmpl" OBJ-XID="xid_518404" H5Path= "/FieldTmpl" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -1303,7 +1303,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="IndexSpec" OBJ-XID="xid_51916-0" H5Path= "/IndexSpec" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="IndexSpec" OBJ-XID="xid_51916" H5Path= "/IndexSpec" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -1479,7 +1479,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Relation" OBJ-XID="xid_465812-0" H5Path= "/Relation" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Relation" OBJ-XID="xid_465812" H5Path= "/Relation" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -1763,7 +1763,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Set" OBJ-XID="xid_254332-0" H5Path= "/Set" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Set" OBJ-XID="xid_254332" H5Path= "/Set" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="1024" /> @@ -1960,7 +1960,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="field-coords_0002" OBJ-XID="xid_14968-0" H5Path= "/field-coords_0002" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="field-coords_0002" OBJ-XID="xid_14968" H5Path= "/field-coords_0002" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -1986,7 +1986,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="field-displacements_0007" OBJ-XID="xid_15968-0" H5Path= "/field-displacements_0007" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="field-displacements_0007" OBJ-XID="xid_15968" H5Path= "/field-displacements_0007" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2013,7 +2013,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="field-distribution_factors_0003" OBJ-XID="xid_15384-0" H5Path= "/field-distribution_factors_0003" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="field-distribution_factors_0003" OBJ-XID="xid_15384" H5Path= "/field-distribution_factors_0003" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2038,7 +2038,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="field-pressure_0013" OBJ-XID="xid_17332-0" H5Path= "/field-pressure_0013" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="field-pressure_0013" OBJ-XID="xid_17332" H5Path= "/field-pressure_0013" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2063,7 +2063,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="field-stress_0011" OBJ-XID="xid_16384-0" H5Path= "/field-stress_0011" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="field-stress_0011" OBJ-XID="xid_16384" H5Path= "/field-stress_0011" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2088,7 +2088,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="field-temperature_0004" OBJ-XID="xid_15676-0" H5Path= "/field-temperature_0004" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="field-temperature_0004" OBJ-XID="xid_15676" H5Path= "/field-temperature_0004" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2113,7 +2113,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="field-temperature_0012" OBJ-XID="xid_17032-0" H5Path= "/field-temperature_0012" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="field-temperature_0012" OBJ-XID="xid_17032" H5Path= "/field-temperature_0012" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2138,7 +2138,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="metablob00000.blob" OBJ-XID="xid_761500-0" H5Path= "/metablob00000.blob" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="metablob00000.blob" OBJ-XID="xid_761500" H5Path= "/metablob00000.blob" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="32" /> @@ -2167,7 +2167,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="metablob00000.index" OBJ-XID="xid_758876-0" H5Path= "/metablob00000.index" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="metablob00000.index" OBJ-XID="xid_758876" H5Path= "/metablob00000.index" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ChunkedLayout Ndims="1"> <hdf5:ChunkDimension DimSize="32" /> @@ -2210,7 +2210,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0000" OBJ-XID="xid_8924-0" H5Path= "/ssrel-_0000" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0000" OBJ-XID="xid_8924" H5Path= "/ssrel-_0000" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2235,7 +2235,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0001" OBJ-XID="xid_9232-0" H5Path= "/ssrel-_0001" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0001" OBJ-XID="xid_9232" H5Path= "/ssrel-_0001" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2260,7 +2260,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0002" OBJ-XID="xid_9520-0" H5Path= "/ssrel-_0002" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0002" OBJ-XID="xid_9520" H5Path= "/ssrel-_0002" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2285,7 +2285,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0003" OBJ-XID="xid_9820-0" H5Path= "/ssrel-_0003" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0003" OBJ-XID="xid_9820" H5Path= "/ssrel-_0003" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2310,7 +2310,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0004" OBJ-XID="xid_10108-0" H5Path= "/ssrel-_0004" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0004" OBJ-XID="xid_10108" H5Path= "/ssrel-_0004" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2335,7 +2335,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0005" OBJ-XID="xid_10400-0" H5Path= "/ssrel-_0005" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0005" OBJ-XID="xid_10400" H5Path= "/ssrel-_0005" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2360,7 +2360,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0006" OBJ-XID="xid_10684-0" H5Path= "/ssrel-_0006" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0006" OBJ-XID="xid_10684" H5Path= "/ssrel-_0006" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2385,7 +2385,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0007" OBJ-XID="xid_11300-0" H5Path= "/ssrel-_0007" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0007" OBJ-XID="xid_11300" H5Path= "/ssrel-_0007" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2410,7 +2410,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0008" OBJ-XID="xid_11576-0" H5Path= "/ssrel-_0008" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0008" OBJ-XID="xid_11576" H5Path= "/ssrel-_0008" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2435,7 +2435,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0009" OBJ-XID="xid_11888-0" H5Path= "/ssrel-_0009" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0009" OBJ-XID="xid_11888" H5Path= "/ssrel-_0009" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2460,7 +2460,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0010" OBJ-XID="xid_12176-0" H5Path= "/ssrel-_0010" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0010" OBJ-XID="xid_12176" H5Path= "/ssrel-_0010" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2485,7 +2485,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0011" OBJ-XID="xid_12788-0" H5Path= "/ssrel-_0011" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0011" OBJ-XID="xid_12788" H5Path= "/ssrel-_0011" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2510,7 +2510,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="ssrel-_0012" OBJ-XID="xid_13080-0" H5Path= "/ssrel-_0012" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="ssrel-_0012" OBJ-XID="xid_13080" H5Path= "/ssrel-_0012" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2535,7 +2535,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="toporel-_0017" OBJ-XID="xid_13372-0" H5Path= "/toporel-_0017" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="toporel-_0017" OBJ-XID="xid_13372" H5Path= "/toporel-_0017" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2560,7 +2560,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="toporel-_0018" OBJ-XID="xid_13708-0" H5Path= "/toporel-_0018" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="toporel-_0018" OBJ-XID="xid_13708" H5Path= "/toporel-_0018" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2585,7 +2585,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="toporel-_0019" OBJ-XID="xid_14344-0" H5Path= "/toporel-_0019" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="toporel-_0019" OBJ-XID="xid_14344" H5Path= "/toporel-_0019" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2610,7 +2610,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="toporel-_0020" OBJ-XID="xid_14632-0" H5Path= "/toporel-_0020" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="toporel-_0020" OBJ-XID="xid_14632" H5Path= "/toporel-_0020" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -2635,9 +2635,9 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Group Name=".attributes" OBJ-XID="xid_5072-0" H5Path="/.attributes" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Group Name="database" OBJ-XID="xid_5728-0" H5Path="/.attributes/database" Parents="xid_5072-0" H5ParentPaths="/.attributes" > - <hdf5:Dataset Name=".SAF_DbProps" OBJ-XID="xid_6104-0" H5Path= "/.attributes/database/.SAF_DbProps" Parents="xid_5728-0" H5ParentPaths="/.attributes/database"> + <hdf5:Group Name=".attributes" OBJ-XID="xid_5072" H5Path="/.attributes" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Group Name="database" OBJ-XID="xid_5728" H5Path="/.attributes/database" Parents="xid_5072" H5ParentPaths="/.attributes" > + <hdf5:Dataset Name=".SAF_DbProps" OBJ-XID="xid_6104" H5Path= "/.attributes/database/.SAF_DbProps" Parents="xid_5728" H5ParentPaths="/.attributes/database"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tslink.h5.xml b/tools/testfiles/tslink.h5.xml index 33912a7..72e559c 100644 --- a/tools/testfiles/tslink.h5.xml +++ b/tools/testfiles/tslink.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tslink.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:SoftLink LinkName="slink1" OBJ-XID="xid_4294967294-4294967293" H5SourcePath="/slink1" TargetPath="somevalue" Parents="xid_696-0" H5ParentPaths="/" /> - <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_4294967292-4294967291" H5SourcePath="/slink2" TargetPath="linkvalue" Parents="xid_696-0" H5ParentPaths="/" /> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:SoftLink LinkName="slink1" OBJ-XID="xid_18446744073709551614" H5SourcePath="/slink1" TargetPath="somevalue" Parents="xid_696" H5ParentPaths="/" /> + <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_18446744073709551613" H5SourcePath="/slink2" TargetPath="linkvalue" Parents="xid_696" H5ParentPaths="/" /> </hdf5:RootGroup> </hdf5:HDF5-File> diff --git a/tools/testfiles/tstr.h5.xml b/tools/testfiles/tstr.h5.xml index 711a6bd..34a6157 100644 --- a/tools/testfiles/tstr.h5.xml +++ b/tools/testfiles/tstr.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tstr.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:Dataset Name="comp1" OBJ-XID="xid_2520-0" H5Path= "/comp1" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="comp1" OBJ-XID="xid_2520" H5Path= "/comp1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -235,7 +235,7 @@ Expected output for 'h5dump --xml tstr.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="string1" OBJ-XID="xid_744-0" H5Path= "/string1" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="string1" OBJ-XID="xid_744" H5Path= "/string1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -272,7 +272,7 @@ Expected output for 'h5dump --xml tstr.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="string2" OBJ-XID="xid_1244-0" H5Path= "/string2" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="string2" OBJ-XID="xid_1244" H5Path= "/string2" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -316,7 +316,7 @@ Expected output for 'h5dump --xml tstr.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="string3" OBJ-XID="xid_1576-0" H5Path= "/string3" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="string3" OBJ-XID="xid_1576" H5Path= "/string3" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -367,7 +367,7 @@ Expected output for 'h5dump --xml tstr.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="string4" OBJ-XID="xid_1904-0" H5Path= "/string4" Parents="xid_696-0" H5ParentPaths="/"> + <hdf5:Dataset Name="string4" OBJ-XID="xid_1904" H5Path= "/string4" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tstr2.h5.xml b/tools/testfiles/tstr2.h5.xml index ca96a05..8656593 100644 --- a/tools/testfiles/tstr2.h5.xml +++ b/tools/testfiles/tstr2.h5.xml @@ -3,9 +3,9 @@ Expected output for 'h5dump --xml tstr2.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:Group Name="g1" OBJ-XID="xid_1344-0" H5Path="/g1" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset1" OBJ-XID="xid_1720-0" H5Path= "/g1/dset1" Parents="xid_1344-0" H5ParentPaths="/g1"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset1" OBJ-XID="xid_1720" H5Path= "/g1/dset1" Parents="xid_1344" H5ParentPaths="/g1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -59,8 +59,8 @@ Expected output for 'h5dump --xml tstr2.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g2" OBJ-XID="xid_3260-0" H5Path="/g2" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset2" OBJ-XID="xid_3308-0" H5Path= "/g2/dset2" Parents="xid_3260-0" H5ParentPaths="/g2"> + <hdf5:Group Name="g2" OBJ-XID="xid_3260" H5Path="/g2" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset2" OBJ-XID="xid_3308" H5Path= "/g2/dset2" Parents="xid_3260" H5ParentPaths="/g2"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -95,8 +95,8 @@ Expected output for 'h5dump --xml tstr2.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g3" OBJ-XID="xid_4848-0" H5Path="/g3" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset3" OBJ-XID="xid_4896-0" H5Path= "/g3/dset3" Parents="xid_4848-0" H5ParentPaths="/g3"> + <hdf5:Group Name="g3" OBJ-XID="xid_4848" H5Path="/g3" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset3" OBJ-XID="xid_4896" H5Path= "/g3/dset3" Parents="xid_4848" H5ParentPaths="/g3"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -131,8 +131,8 @@ Expected output for 'h5dump --xml tstr2.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g4" OBJ-XID="xid_6436-0" H5Path="/g4" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset4" OBJ-XID="xid_6484-0" H5Path= "/g4/dset4" Parents="xid_6436-0" H5ParentPaths="/g4"> + <hdf5:Group Name="g4" OBJ-XID="xid_6436" H5Path="/g4" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset4" OBJ-XID="xid_6484" H5Path= "/g4/dset4" Parents="xid_6436" H5ParentPaths="/g4"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -167,8 +167,8 @@ Expected output for 'h5dump --xml tstr2.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g5" OBJ-XID="xid_8024-0" H5Path="/g5" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset5" OBJ-XID="xid_8072-0" H5Path= "/g5/dset5" Parents="xid_8024-0" H5ParentPaths="/g5"> + <hdf5:Group Name="g5" OBJ-XID="xid_8024" H5Path="/g5" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset5" OBJ-XID="xid_8072" H5Path= "/g5/dset5" Parents="xid_8024" H5ParentPaths="/g5"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -203,8 +203,8 @@ Expected output for 'h5dump --xml tstr2.h5' </hdf5:Data> </hdf5:Dataset> </hdf5:Group> - <hdf5:Group Name="g6" OBJ-XID="xid_9612-0" H5Path="/g6" Parents="xid_696-0" H5ParentPaths="/" > - <hdf5:Dataset Name="dset6" OBJ-XID="xid_9660-0" H5Path= "/g6/dset6" Parents="xid_9612-0" H5ParentPaths="/g6"> + <hdf5:Group Name="g6" OBJ-XID="xid_9612" H5Path="/g6" Parents="xid_696" H5ParentPaths="/" > + <hdf5:Dataset Name="dset6" OBJ-XID="xid_9660" H5Path= "/g6/dset6" Parents="xid_9612" H5ParentPaths="/g6"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tstring-at.h5.xml b/tools/testfiles/tstring-at.h5.xml index 183f074..6a2db86 100644 --- a/tools/testfiles/tstring-at.h5.xml +++ b/tools/testfiles/tstring-at.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tstring-at.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:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tstring.h5.xml b/tools/testfiles/tstring.h5.xml index 058fbb8..5106156 100644 --- a/tools/testfiles/tstring.h5.xml +++ b/tools/testfiles/tstring.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tstring.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_928-0" H5Path="/"> - <hdf5:Dataset Name="dset1" OBJ-XID="xid_976-0" H5Path= "/dset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="dset1" OBJ-XID="xid_976" H5Path= "/dset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tvldtypes1.h5.xml b/tools/testfiles/tvldtypes1.h5.xml index 231c55a..856df25 100644 --- a/tools/testfiles/tvldtypes1.h5.xml +++ b/tools/testfiles/tvldtypes1.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tvldtypes1.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976-0" H5Path= "/Dataset1.0" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -34,7 +34,7 @@ Expected output for 'h5dump --xml tvldtypes1.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset2.0" OBJ-XID="xid_1576-0" H5Path= "/Dataset2.0" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset2.0" OBJ-XID="xid_1576" H5Path= "/Dataset2.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -64,7 +64,7 @@ Expected output for 'h5dump --xml tvldtypes1.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:Dataset Name="Dataset3.0" OBJ-XID="xid_6272-0" H5Path= "/Dataset3.0" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset3.0" OBJ-XID="xid_6272" H5Path= "/Dataset3.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/testfiles/tvldtypes2.h5.xml index 0fea1ef..d9ac4bc 100644 --- a/tools/testfiles/tvldtypes2.h5.xml +++ b/tools/testfiles/tvldtypes2.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tvldtypes2.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tvldtypes3.h5.xml b/tools/testfiles/tvldtypes3.h5.xml index be7627f..3476df3 100644 --- a/tools/testfiles/tvldtypes3.h5.xml +++ b/tools/testfiles/tvldtypes3.h5.xml @@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tvldtypes3.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_928-0" H5Path="/"> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/testfiles/tvlstr.h5.xml index 6216c8f..f8cfe97 100644 --- a/tools/testfiles/tvlstr.h5.xml +++ b/tools/testfiles/tvlstr.h5.xml @@ -3,7 +3,7 @@ Expected output for 'h5dump --xml tvlstr.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_928-0" H5Path="/"> +<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Attribute Name="test_scalar"> <hdf5:Dataspace> <hdf5:ScalarDataspace /> @@ -19,14 +19,14 @@ Expected output for 'h5dump --xml tvlstr.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:NamedDataType Name="vl_string_type" OBJ-XID="xid_1576-0" H5Path="/vl_string_type" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:NamedDataType Name="vl_string_type" OBJ-XID="xid_1576" H5Path="/vl_string_type" Parents="xid_928" H5ParentPaths="/"> <hdf5:DataType> <hdf5:AtomicType> <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLPAD"/> </hdf5:AtomicType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> |