summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRobert E. McGrath <mcgrath@ncsa.uiuc.edu>2001-02-22 19:21:37 (GMT)
committerRobert E. McGrath <mcgrath@ncsa.uiuc.edu>2001-02-22 19:21:37 (GMT)
commit015d63862441d5fa898f8465ef755181ef4210b2 (patch)
treedf1cce7c3989f4e72a76e55e458318ba8ee90f0a /tools
parente4e6daee0ccf4bd8e64a215e70c2096049877440 (diff)
downloadhdf5-015d63862441d5fa898f8465ef755181ef4210b2.zip
hdf5-015d63862441d5fa898f8465ef755181ef4210b2.tar.gz
hdf5-015d63862441d5fa898f8465ef755181ef4210b2.tar.bz2
[svn-r3485]
Purpose: fix bug in XML output Description: OBJ-XID, Parents, etc. were messed up in several cases. Solution: Fixed. Updated tests to have correct results in them Note: tvldtype.h5.xml is a junk file, Platforms tested: Solaris 2.7
Diffstat (limited to 'tools')
-rw-r--r--tools/testfiles/tall.h5.xml2
-rw-r--r--tools/testfiles/tcompound.h5.xml4
-rw-r--r--tools/testfiles/tcompound2.h5.xml4
-rw-r--r--tools/testfiles/thlink.h5.xml4
-rw-r--r--tools/testfiles/tloop2.h5.xml2
-rw-r--r--tools/testfiles/tmany.h5.xml8
-rw-r--r--tools/testfiles/tobjref.h5.xml2
-rw-r--r--tools/testfiles/tslink.h5.xml4
-rw-r--r--tools/testfiles/tvldtypes.h5.xml3
9 files changed, 15 insertions, 18 deletions
diff --git a/tools/testfiles/tall.h5.xml b/tools/testfiles/tall.h5.xml
index 6886916..7d77bb0 100644
--- a/tools/testfiles/tall.h5.xml
+++ b/tools/testfiles/tall.h5.xml
@@ -126,7 +126,7 @@ Expected output for 'h5dump --xml tall.h5'
</Group>
<Group Name="g1.2" OBJ-XID="/g1/g1.2" Parents="/g1" >
<Group Name="g1.2.1" OBJ-XID="/g1/g1.2/g1.2.1" Parents="/g1/g1.2" >
- <SoftLink LinkName="slink" Target="somevalue" TargetObj="somevalue" OBJ-XID="slink" Source="/g1/g1.2/g1.2.1"/>
+ <SoftLink LinkName="slink" Target="somevalue" TargetObj="/g1/g1.2/g1.2.1/somevalue" OBJ-XID="/g1/g1.2/g1.2.1/slink" Source="/g1/g1.2/g1.2.1"/>
</Group>
</Group>
</Group>
diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index cc2db90..25db6ae 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -5,7 +5,7 @@ Expected output for 'h5dump --xml tcompound.h5'
<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
<HDF5-File>
<RootGroup OBJ-XID="root">
- <NamedDataType Name="#6632:0" OBJ-XID="/#6632:0" Parents="#6632:0">
+ <NamedDataType Name="#6632:0" OBJ-XID="/#6632:0" Parents="root">
<CompoundType>
<Field FieldName="int">
<DataType>
@@ -109,7 +109,7 @@ Expected output for 'h5dump --xml tcompound.h5'
</Data>
</Dataset>
<Group Name="group1" OBJ-XID="/group1" Parents="/" >
- <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="type3">
+ <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
<CompoundType>
<Field FieldName="int">
<DataType>
diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/testfiles/tcompound2.h5.xml
index 95fe67a..b19226c 100644
--- a/tools/testfiles/tcompound2.h5.xml
+++ b/tools/testfiles/tcompound2.h5.xml
@@ -5,7 +5,7 @@ Expected output for 'h5dump --xml tcompound2.h5'
<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
<HDF5-File>
<RootGroup OBJ-XID="root">
- <NamedDataType Name="#9560:0" OBJ-XID="/#9560:0" Parents="#9560:0">
+ <NamedDataType Name="#9560:0" OBJ-XID="/#9560:0" Parents="root">
<CompoundType>
<Field FieldName="int">
<DataType>
@@ -114,7 +114,7 @@ Expected output for 'h5dump --xml tcompound2.h5'
</Data>
</Dataset>
<Group Name="group1" OBJ-XID="/group1" Parents="/" >
- <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="type3">
+ <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
<CompoundType>
<Field FieldName="int">
<DataType>
diff --git a/tools/testfiles/thlink.h5.xml b/tools/testfiles/thlink.h5.xml
index 306f4eb..c116594 100644
--- a/tools/testfiles/thlink.h5.xml
+++ b/tools/testfiles/thlink.h5.xml
@@ -23,11 +23,11 @@ Expected output for 'h5dump --xml thlink.h5'
</Data>
</Dataset>
<Group Name="g1" OBJ-XID="/g1" Parents="/" >
- <Dataset Name="dset2" OBJ-XID="/g1" Parents="/g1">
+ <Dataset Name="dset2" OBJ-XID="/g1/dset2" Parents="/g1">
<DatasetPtr OBJ-XID="/dset1"/>
</Dataset>
<Group Name="g1.1" OBJ-XID="/g1/g1.1" Parents="/g1" >
- <Dataset Name="dset3" OBJ-XID="/g1/g1.1" Parents="/g1/g1.1">
+ <Dataset Name="dset3" OBJ-XID="/g1/g1.1/dset3" Parents="/g1/g1.1">
<DatasetPtr OBJ-XID="/dset1"/>
</Dataset>
</Group>
diff --git a/tools/testfiles/tloop2.h5.xml b/tools/testfiles/tloop2.h5.xml
index 2af291a..d5accdf 100644
--- a/tools/testfiles/tloop2.h5.xml
+++ b/tools/testfiles/tloop2.h5.xml
@@ -7,7 +7,7 @@ Expected output for 'h5dump --xml tloop2.h5'
<RootGroup OBJ-XID="root">
<Group Name="g1" OBJ-XID="/g1" Parents="/" >
<Group Name="g1.1" OBJ-XID="/g1/g1.1" Parents="/g1" >
- <SoftLink LinkName="g2.1" Target="/g1" TargetObj="/g1" OBJ-XID="g2.1" Source="/g1/g1.1"/>
+ <SoftLink LinkName="g2.1" Target="/g1" TargetObj="/g1/g1.1/g1" OBJ-XID="/g1/g1.1/g2.1" Source="/g1/g1.1"/>
</Group>
</Group>
<Group Name="g2" OBJ-XID="/g2" Parents="/" >
diff --git a/tools/testfiles/tmany.h5.xml b/tools/testfiles/tmany.h5.xml
index ab1b81a..11f22c9 100644
--- a/tools/testfiles/tmany.h5.xml
+++ b/tools/testfiles/tmany.h5.xml
@@ -260,13 +260,13 @@ Expected output for 'h5dump --xml tmany.h5'
</Dataset>
</Group>
<Group Name="g1.2" OBJ-XID="/g1/g1.2" Parents="/g1" >
- <Dataset Name="link1" OBJ-XID="/g1/g1.2" Parents="/g1/g1.2">
+ <Dataset Name="link1" OBJ-XID="/g1/g1.2/link1" Parents="/g1/g1.2">
<DatasetPtr OBJ-XID="/g1/g1.1/dset1"/>
</Dataset>
</Group>
</Group>
<Group Name="g2" OBJ-XID="/g2" Parents="/" >
- <SoftLink LinkName="slink2" Target="/g1" TargetObj="/g1" OBJ-XID="slink2" Source="/g2"/>
+ <SoftLink LinkName="slink2" Target="/g1" TargetObj="/g2/g1" OBJ-XID="/g2/slink2" Source="/g2"/>
</Group>
<Group Name="g3" OBJ-XID="/g3" Parents="/" >
<Dataset Name="link3" OBJ-XID="/g3/link3" Parents="/g3">
@@ -298,12 +298,12 @@ Expected output for 'h5dump --xml tmany.h5'
</Dataset>
</Group>
<Group Name="g4" OBJ-XID="/g4" Parents="/" >
- <Dataset Name="dset2" OBJ-XID="/g4" Parents="/g4">
+ <Dataset Name="dset2" OBJ-XID="/g4/dset2" Parents="/g4">
<DatasetPtr OBJ-XID="/g3/link3"/>
</Dataset>
</Group>
<Group Name="g5" OBJ-XID="/g5" Parents="/" >
- <SoftLink LinkName="slink4" Target="/g6/dset3" TargetObj="/g6/dset3" OBJ-XID="slink4" Source="/g5"/>
+ <SoftLink LinkName="slink4" Target="/g6/dset3" TargetObj="/g5/g6/dset3" OBJ-XID="/g5/slink4" Source="/g5"/>
</Group>
<Group Name="g6" OBJ-XID="/g6" Parents="/" >
<Dataset Name="dset3" OBJ-XID="/g6/dset3" Parents="/g6">
diff --git a/tools/testfiles/tobjref.h5.xml b/tools/testfiles/tobjref.h5.xml
index f0b856e..3cfe6f7 100644
--- a/tools/testfiles/tobjref.h5.xml
+++ b/tools/testfiles/tobjref.h5.xml
@@ -28,7 +28,7 @@ Expected output for 'h5dump --xml tobjref.h5'
</Data>
</Dataset>
<Group Name="Group1" OBJ-XID="/Group1" Parents="/" >
- <NamedDataType Name="Datatype1" OBJ-XID="/Group1/Datatype1" Parents="Datatype1">
+ <NamedDataType Name="Datatype1" OBJ-XID="/Group1/Datatype1" Parents="/Group1">
<CompoundType>
<Field FieldName="a">
<DataType>
diff --git a/tools/testfiles/tslink.h5.xml b/tools/testfiles/tslink.h5.xml
index 5b2d4a5..6dadce5 100644
--- a/tools/testfiles/tslink.h5.xml
+++ b/tools/testfiles/tslink.h5.xml
@@ -5,7 +5,7 @@ Expected output for 'h5dump --xml tslink.h5'
<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
<HDF5-File>
<RootGroup OBJ-XID="root">
- <SoftLink LinkName="slink1" Target="somevalue" TargetObj="somevalue" OBJ-XID="slink1" Source="root"/>
- <SoftLink LinkName="slink2" Target="linkvalue" TargetObj="linkvalue" OBJ-XID="slink2" Source="root"/>
+ <SoftLink LinkName="slink1" Target="somevalue" TargetObj="/somevalue" OBJ-XID="/slink1" Source="root"/>
+ <SoftLink LinkName="slink2" Target="linkvalue" TargetObj="/linkvalue" OBJ-XID="/slink2" Source="root"/>
</RootGroup>
</HDF5-File>
diff --git a/tools/testfiles/tvldtypes.h5.xml b/tools/testfiles/tvldtypes.h5.xml
deleted file mode 100644
index 132e7b1..0000000
--- a/tools/testfiles/tvldtypes.h5.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-#############################
-Expected output for 'h5dump -xml tvldtypes.h5'
-#############################