summaryrefslogtreecommitdiffstats
path: root/tools/testfiles
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-09-13 15:44:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-09-13 15:44:56 (GMT)
commit579284f422b6ed25b7a5f4a518c19740fff297c8 (patch)
tree564b2a7b4c13854a19ffaf465f94e6abd52d6340 /tools/testfiles
parent15d118faedd8e61e8ec2a715cf8fcea5b1afab35 (diff)
downloadhdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.zip
hdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.tar.gz
hdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.tar.bz2
[svn-r14144] Description:
Move H5Gget_objinfo() to deprecated symbols section and retarget internal usage to H5Lget_info()/H5Oget_info(). Misc. other code cleanups... Tested on: FreeBSD/32 6.2 (duty) FreeBSD/64 6.2 (liberty) Linux/32 2.6 (kagiso) Linux/64 2.6 (smirom) AIX/32 5.3 (copper) Solaris/32 2.10 (linew) Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'tools/testfiles')
-rw-r--r--tools/testfiles/h5copytst.out.ls55
-rw-r--r--tools/testfiles/tall-1.ddl2
-rw-r--r--tools/testfiles/tall-2A.ddl2
-rw-r--r--tools/testfiles/tall-2A.h5.xml4
-rw-r--r--tools/testfiles/tall-2B.ddl2
-rw-r--r--tools/testfiles/tall.h5.xml4
-rw-r--r--tools/testfiles/tattr2.ls1
-rw-r--r--tools/testfiles/tcompound.h5.xml142
-rw-r--r--tools/testfiles/tcompound2.h5.xml142
-rw-r--r--tools/testfiles/tnamed_dtype_attr.h5.xml14
-rw-r--r--tools/testfiles/tnofilename.ddl2
-rw-r--r--tools/testfiles/tobjref.h5.xml54
-rw-r--r--tools/testfiles/tref.h5.xml58
-rw-r--r--tools/testfiles/tsaf.h5.xml578
-rw-r--r--tools/testfiles/tvlstr.h5.xml14
15 files changed, 509 insertions, 565 deletions
diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls
index 378aa0f..c4d1778 100644
--- a/tools/testfiles/h5copytst.out.ls
+++ b/tools/testfiles/h5copytst.out.ls
@@ -11,7 +11,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/A/B1/simple Dataset {6/6}
Location: 1:90216
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/A/B2 Group
@@ -20,7 +19,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/A/B2/simple2 Dataset {6/6}
Location: 1:94456
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/C Group
@@ -32,7 +30,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/C/D/simple Dataset {6/6}
Location: 1:97664
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E Group
@@ -47,20 +44,17 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/E/F/grp_dsets/chunk Dataset {6/6}
Location: 1:102744
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/compact Dataset {6/6}
Location: 1:103200
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/compound Dataset {2/2}
Location: 1:103336
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -69,7 +63,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/E/F/grp_dsets/compressed Dataset {6/6}
Location: 1:103552
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
@@ -77,14 +70,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/E/F/grp_dsets/named_vl Dataset {2/2}
Location: 1:103768
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: shared-1:103720 variable length of
32-bit little-endian integer
/E/F/grp_dsets/nested_vl Dataset {2/2}
Location: 1:112240
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: variable length of
variable length of
@@ -92,7 +83,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/E/F/grp_dsets/simple Dataset {6/6}
Location: 1:112384
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/vl Type
@@ -115,20 +105,17 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/G/H/grp_nested/grp_dsets/chunk Dataset {6/6}
Location: 1:118088
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/compact Dataset {6/6}
Location: 1:120688
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/compound Dataset {2/2}
Location: 1:120824
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -137,7 +124,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/G/H/grp_nested/grp_dsets/compressed Dataset {6/6}
Location: 1:123136
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
@@ -145,14 +131,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/G/H/grp_nested/grp_dsets/named_vl Dataset {2/2}
Location: 1:127448
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: shared-1:123304 variable length of
32-bit little-endian integer
/G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2}
Location: 1:127576
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: variable length of
variable length of
@@ -160,7 +144,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/G/H/grp_nested/grp_dsets/simple Dataset {6/6}
Location: 1:127720
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/vl Type
@@ -171,20 +154,17 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/chunk Dataset {6/6}
Location: 1:6216
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/compact Dataset {6/6}
Location: 1:6344
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/compound Dataset {2/2}
Location: 1:8528
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -193,7 +173,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/compressed Dataset {6/6}
Location: 1:12888
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
@@ -204,20 +183,17 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_dsets/chunk Dataset {6/6}
Location: 1:35896
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/compact Dataset {6/6}
Location: 1:36352
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/compound Dataset {2/2}
Location: 1:36488
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -226,7 +202,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_dsets/compressed Dataset {6/6}
Location: 1:36704
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
@@ -234,14 +209,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_dsets/named_vl Dataset {2/2}
Location: 1:36920
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: shared-1:36872 variable length of
32-bit little-endian integer
/grp_dsets/nested_vl Dataset {2/2}
Location: 1:45392
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: variable length of
variable length of
@@ -249,13 +222,11 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_dsets/simple Dataset {6/6}
Location: 1:45536
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/simple_group Dataset {6/6}
Location: 1:61744
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/vl Type
@@ -275,20 +246,17 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_nested/grp_dsets/chunk Dataset {6/6}
Location: 1:49256
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/compact Dataset {6/6}
Location: 1:51856
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/compound Dataset {2/2}
Location: 1:51992
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -297,7 +265,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_nested/grp_dsets/compressed Dataset {6/6}
Location: 1:54304
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
@@ -305,14 +272,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_nested/grp_dsets/named_vl Dataset {2/2}
Location: 1:58616
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: shared-1:54472 variable length of
32-bit little-endian integer
/grp_nested/grp_dsets/nested_vl Dataset {2/2}
Location: 1:58744
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: variable length of
variable length of
@@ -320,7 +285,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_nested/grp_dsets/simple Dataset {6/6}
Location: 1:58888
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/vl Type
@@ -334,20 +298,17 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/chunk Dataset {6/6}
Location: 1:65088
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/compact Dataset {6/6}
Location: 1:65544
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/compound Dataset {2/2}
Location: 1:65680
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -356,7 +317,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/compressed Dataset {6/6}
Location: 1:65896
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
@@ -367,20 +327,17 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/grp_dsets/chunk Dataset {6/6}
Location: 1:78072
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/compact Dataset {6/6}
Location: 1:78528
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/compound Dataset {2/2}
Location: 1:78664
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -389,7 +346,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/grp_dsets/compressed Dataset {6/6}
Location: 1:78880
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
@@ -397,14 +353,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/grp_dsets/named_vl Dataset {2/2}
Location: 1:79096
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: shared-1:79048 variable length of
32-bit little-endian integer
/grp_rename/grp_dsets/nested_vl Dataset {2/2}
Location: 1:87568
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: variable length of
variable length of
@@ -412,7 +366,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/grp_dsets/simple Dataset {6/6}
Location: 1:87712
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/vl Type
@@ -423,14 +376,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/named_vl Dataset {2/2}
Location: 1:66112
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: shared-1:66064 variable length of
32-bit little-endian integer
/grp_rename/nested_vl Dataset {2/2}
Location: 1:74584
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: variable length of
variable length of
@@ -438,7 +389,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/grp_rename/simple Dataset {6/6}
Location: 1:74728
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/vl Type
@@ -449,14 +399,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/named_vl Dataset {2/2}
Location: 1:13104
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: shared-1:13056 variable length of
32-bit little-endian integer
/nested_vl Dataset {2/2}
Location: 1:27392
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: variable length of
variable length of
@@ -464,7 +412,6 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/rename Dataset {2/2}
Location: 1:31760
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
@@ -473,12 +420,10 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
/simple Dataset {6/6}
Location: 1:800
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/simple_top Dataset {6/6}
Location: 1:29584
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: <details removed for portability>
Type: 32-bit little-endian integer
diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl
index 6069293..cd5f721 100644
--- a/tools/testfiles/tall-1.ddl
+++ b/tools/testfiles/tall-1.ddl
@@ -68,7 +68,7 @@ GROUP "/" {
LINKCLASS 64
TARGETFILE "somefile"
TARGETPATH "somepath"
-}
+ }
GROUP "g1.2.1" {
SOFTLINK "slink" {
LINKTARGET "somevalue"
diff --git a/tools/testfiles/tall-2A.ddl b/tools/testfiles/tall-2A.ddl
index b16feb8..2c56501 100644
--- a/tools/testfiles/tall-2A.ddl
+++ b/tools/testfiles/tall-2A.ddl
@@ -52,7 +52,7 @@ GROUP "/" {
LINKCLASS 64
TARGETFILE "somefile"
TARGETPATH "somepath"
-}
+ }
GROUP "g1.2.1" {
SOFTLINK "slink" {
LINKTARGET "somevalue"
diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/testfiles/tall-2A.h5.xml
index 8a8467c..314ab4e 100644
--- a/tools/testfiles/tall-2A.h5.xml
+++ b/tools/testfiles/tall-2A.h5.xml
@@ -127,10 +127,10 @@ Expected output for 'h5dump --xml -A tall.h5'
</hdf5:Dataset>
</hdf5:Group>
<hdf5:Group Name="g1.2" OBJ-XID="xid_3568" H5Path="/g1/g1.2" Parents="xid_800" H5ParentPaths="/g1" >
+ <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile" TargetPath="somepath" Parents="xid_3568" H5ParentPaths="/g1/g1.2" />
<hdf5:Group Name="g1.2.1" OBJ-XID="xid_4272" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3568" H5ParentPaths="/g1/g1.2" >
- <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue" Parents="xid_4272" H5ParentPaths="/g1/g1.2/g1.2.1" />
+ <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue" Parents="xid_4272" H5ParentPaths="/g1/g1.2/g1.2.1" />
</hdf5:Group>
- <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile" TargetPath="somepath" Parents="xid_3568" H5ParentPaths="/g1/g1.2" />
</hdf5:Group>
</hdf5:Group>
<hdf5:Group Name="g2" OBJ-XID="xid_1832" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
diff --git a/tools/testfiles/tall-2B.ddl b/tools/testfiles/tall-2B.ddl
index 002156e..ec220e9 100644
--- a/tools/testfiles/tall-2B.ddl
+++ b/tools/testfiles/tall-2B.ddl
@@ -48,7 +48,7 @@ GROUP "/" {
LINKCLASS 64
TARGETFILE "somefile"
TARGETPATH "somepath"
-}
+ }
GROUP "g1.2.1" {
SOFTLINK "slink" {
LINKTARGET "somevalue"
diff --git a/tools/testfiles/tall.h5.xml b/tools/testfiles/tall.h5.xml
index 8f11e54..3747193 100644
--- a/tools/testfiles/tall.h5.xml
+++ b/tools/testfiles/tall.h5.xml
@@ -140,10 +140,10 @@ Expected output for 'h5dump --xml tall.h5'
</hdf5:Dataset>
</hdf5:Group>
<hdf5:Group Name="g1.2" OBJ-XID="xid_3568" H5Path="/g1/g1.2" Parents="xid_800" H5ParentPaths="/g1" >
+ <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile" TargetPath="somepath" Parents="xid_3568" H5ParentPaths="/g1/g1.2" />
<hdf5:Group Name="g1.2.1" OBJ-XID="xid_4272" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3568" H5ParentPaths="/g1/g1.2" >
- <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue" Parents="xid_4272" H5ParentPaths="/g1/g1.2/g1.2.1" />
+ <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue" Parents="xid_4272" H5ParentPaths="/g1/g1.2/g1.2.1" />
</hdf5:Group>
- <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile" TargetPath="somepath" Parents="xid_3568" H5ParentPaths="/g1/g1.2" />
</hdf5:Group>
</hdf5:Group>
<hdf5:Group Name="g2" OBJ-XID="xid_1832" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
diff --git a/tools/testfiles/tattr2.ls b/tools/testfiles/tattr2.ls
index 01ad413..e34206e 100644
--- a/tools/testfiles/tattr2.ls
+++ b/tools/testfiles/tattr2.ls
@@ -308,7 +308,6 @@ dset Dataset {2/2}
(2,2,1) 18, 19, 20, 21, 22, 23, 24
Location: 1:976
Links: 1
- Modified: XXXX-XX-XX XX:XX:XX XXX
Storage: 8 logical bytes, 0 allocated bytes
Type: 32-bit little-endian integer
g1 Group
diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index 1cbbf2e..c6de351 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -24,57 +24,6 @@ Expected output for 'h5dump --xml tcompound.h5'
</hdf5:CompoundType>
</hdf5:DataType>
</hdf5:NamedDataType>
- <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="int_name">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="float_name">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
- <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="int_array">
- <hdf5:DataType>
- <hdf5:ArrayType Ndims="1">
- <hdf5:ArrayDimension DimSize="4"/>
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:ArrayType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="float_array">
- <hdf5:DataType>
- <hdf5:ArrayType Ndims="2">
- <hdf5:ArrayDimension DimSize="5"/>
- <hdf5:ArrayDimension DimSize="6"/>
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:ArrayType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
<hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
@@ -122,26 +71,6 @@ Expected output for 'h5dump --xml tcompound.h5'
</hdf5:Data>
</hdf5:Dataset>
<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">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="float">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
<hdf5:Dataset Name="dset2" OBJ-XID="xid_2152" H5Path= "/group1/dset2" Parents="xid_2104" H5ParentPaths="/group1">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
@@ -298,6 +227,26 @@ Expected output for 'h5dump --xml tcompound.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>
+ <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592" H5Path="/group1/type3" Parents="xid_2104" H5ParentPaths="/group1">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="int">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="float">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
</hdf5:Group>
<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">
@@ -323,5 +272,56 @@ Expected output for 'h5dump --xml tcompound.h5'
</hdf5:Data>
</hdf5:Dataset>
</hdf5:Group>
+ <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="int_name">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="float_name">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
+ <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="int_array">
+ <hdf5:DataType>
+ <hdf5:ArrayType Ndims="1">
+ <hdf5:ArrayDimension DimSize="4"/>
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:ArrayType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="float_array">
+ <hdf5:DataType>
+ <hdf5:ArrayType Ndims="2">
+ <hdf5:ArrayDimension DimSize="5"/>
+ <hdf5:ArrayDimension DimSize="6"/>
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:ArrayType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
</hdf5:RootGroup>
</hdf5:HDF5-File>
diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/testfiles/tcompound2.h5.xml
index 2940caa..e0b087c 100644
--- a/tools/testfiles/tcompound2.h5.xml
+++ b/tools/testfiles/tcompound2.h5.xml
@@ -24,57 +24,6 @@ Expected output for 'h5dump --xml tcompound2.h5'
</hdf5:CompoundType>
</hdf5:DataType>
</hdf5:NamedDataType>
- <hdf5:NamedDataType Name="type1" OBJ-XID="xid_3280" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="int_name">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="float_name">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
- <hdf5:NamedDataType Name="type2" OBJ-XID="xid_6544" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="int_array">
- <hdf5:DataType>
- <hdf5:ArrayType Ndims="1">
- <hdf5:ArrayDimension DimSize="4"/>
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:ArrayType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="float_array">
- <hdf5:DataType>
- <hdf5:ArrayType Ndims="2">
- <hdf5:ArrayDimension DimSize="5"/>
- <hdf5:ArrayDimension DimSize="6"/>
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:ArrayType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
<hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
<hdf5:StorageLayout>
<hdf5:ChunkedLayout Ndims="1">
@@ -126,26 +75,6 @@ Expected output for 'h5dump --xml tcompound2.h5'
</hdf5:Data>
</hdf5:Dataset>
<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">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="float">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
<hdf5:Dataset Name="dset2" OBJ-XID="xid_4008" H5Path= "/group1/dset2" Parents="xid_3960" H5ParentPaths="/group1">
<hdf5:StorageLayout>
<hdf5:ChunkedLayout Ndims="1">
@@ -198,6 +127,26 @@ Expected output for 'h5dump --xml tcompound2.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>
+ <hdf5:NamedDataType Name="type3" OBJ-XID="xid_6624" H5Path="/group1/type3" Parents="xid_3960" H5ParentPaths="/group1">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="int">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="float">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
</hdf5:Group>
<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">
@@ -227,5 +176,56 @@ Expected output for 'h5dump --xml tcompound2.h5'
</hdf5:Data>
</hdf5:Dataset>
</hdf5:Group>
+ <hdf5:NamedDataType Name="type1" OBJ-XID="xid_3280" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="int_name">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="float_name">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
+ <hdf5:NamedDataType Name="type2" OBJ-XID="xid_6544" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="int_array">
+ <hdf5:DataType>
+ <hdf5:ArrayType Ndims="1">
+ <hdf5:ArrayDimension DimSize="4"/>
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:ArrayType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="float_array">
+ <hdf5:DataType>
+ <hdf5:ArrayType Ndims="2">
+ <hdf5:ArrayDimension DimSize="5"/>
+ <hdf5:ArrayDimension DimSize="6"/>
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:ArrayType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
</hdf5:RootGroup>
</hdf5:HDF5-File>
diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/testfiles/tnamed_dtype_attr.h5.xml
index 9d4a0c0..0b9ceae 100644
--- a/tools/testfiles/tnamed_dtype_attr.h5.xml
+++ b/tools/testfiles/tnamed_dtype_attr.h5.xml
@@ -4,13 +4,6 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5'
<?xml version="1.0" encoding="UTF-8"?>
<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5File http://hdfgroup.org/DTDs/HDF5-File.xsd">
<hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
- <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_792" H5Path="/Datatype" Parents="xid_96" H5ParentPaths="/">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
<hdf5:Dataset Name="Dataset" OBJ-XID="xid_1264" H5Path= "/Dataset" Parents="xid_96" H5ParentPaths="/">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
@@ -39,6 +32,13 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5'
<hdf5:NoData/>
</hdf5:Data>
</hdf5:Dataset>
+ <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_792" H5Path="/Datatype" Parents="xid_96" H5ParentPaths="/">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
<hdf5:Group Name="g1" OBJ-XID="xid_1536" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
<hdf5:Attribute Name="Attribute">
<hdf5:Dataspace>
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
index a516dde..9eb9f88 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -25,7 +25,7 @@ usage: h5dump [OPTIONS] file
with -o (output file) and -d (dataset). B can be:
MEMORY for a memory type, FILE for the file type,
LE or BE for pre-existing little or big endian types
- -t P, --datatype=P Print the specified named data type
+ -t P, --datatype=P Print the specified named datatype
-w N, --width=N Set the number of columns of output
-x, --xml Output in XML using Schema
-u, --use-dtd Output in XML using DTD
diff --git a/tools/testfiles/tobjref.h5.xml b/tools/testfiles/tobjref.h5.xml
index 57cb64b..327291e 100644
--- a/tools/testfiles/tobjref.h5.xml
+++ b/tools/testfiles/tobjref.h5.xml
@@ -35,33 +35,6 @@ Expected output for 'h5dump --xml tobjref.h5'
</hdf5:Data>
</hdf5:Dataset>
<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">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="b">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="c">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:NamedDataType>
<hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1696" H5Path= "/Group1/Dataset1" Parents="xid_1320" H5ParentPaths="/Group1">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
@@ -112,6 +85,33 @@ Expected output for 'h5dump --xml tobjref.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>
+ <hdf5:NamedDataType Name="Datatype1" OBJ-XID="xid_2268" H5Path="/Group1/Datatype1" Parents="xid_1320" H5ParentPaths="/Group1">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="a">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="b">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="c">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:NamedDataType>
</hdf5:Group>
</hdf5:RootGroup>
</hdf5:HDF5-File>
diff --git a/tools/testfiles/tref.h5.xml b/tools/testfiles/tref.h5.xml
index 5edd4d2..6b093de 100644
--- a/tools/testfiles/tref.h5.xml
+++ b/tools/testfiles/tref.h5.xml
@@ -4,35 +4,6 @@ Expected output for 'h5dump --xml tref.h5'
<?xml version="1.0" encoding="UTF-8"?>
<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5File http://hdfgroup.org/DTDs/HDF5-File.xsd">
<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>
- <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
- <hdf5:FillValue>
- <hdf5:NoFill/>
- </hdf5:FillValue>
- </hdf5:FillValueInfo>
- <hdf5:Dataspace>
- <hdf5:SimpleDataspace Ndims="1">
- <hdf5:Dimension DimSize="3" MaxDimSize="3"/>
- </hdf5:SimpleDataspace>
- </hdf5:Dataspace>
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:ReferenceType>
- <hdf5:ObjectReferenceType />
- </hdf5:ReferenceType>
- </hdf5:AtomicType>
- </hdf5:DataType>
- <hdf5:Data>
- <hdf5:DataFromFile>
- "/Group1/Dataset1"
- "/Group1/Dataset2"
- "/Group1"
- </hdf5:DataFromFile>
- </hdf5:Data>
- </hdf5:Dataset>
<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>
@@ -85,5 +56,34 @@ Expected output for 'h5dump --xml tref.h5'
</hdf5:Data>
</hdf5:Dataset>
</hdf5:Group>
+ <hdf5:Dataset Name="ZZZDataset3" OBJ-XID="xid_2612" H5Path= "/ZZZDataset3" Parents="xid_696" H5ParentPaths="/">
+ <hdf5:StorageLayout>
+ <hdf5:ContiguousLayout/>
+ </hdf5:StorageLayout>
+ <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+ <hdf5:FillValue>
+ <hdf5:NoFill/>
+ </hdf5:FillValue>
+ </hdf5:FillValueInfo>
+ <hdf5:Dataspace>
+ <hdf5:SimpleDataspace Ndims="1">
+ <hdf5:Dimension DimSize="3" MaxDimSize="3"/>
+ </hdf5:SimpleDataspace>
+ </hdf5:Dataspace>
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:ReferenceType>
+ <hdf5:ObjectReferenceType />
+ </hdf5:ReferenceType>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ <hdf5:Data>
+ <hdf5:DataFromFile>
+ "/Group1/Dataset1"
+ "/Group1/Dataset2"
+ "/Group1"
+ </hdf5:DataFromFile>
+ </hdf5:Data>
+ </hdf5:Dataset>
</hdf5:RootGroup>
</hdf5:HDF5-File>
diff --git a/tools/testfiles/tsaf.h5.xml b/tools/testfiles/tsaf.h5.xml
index 8c44bab..3f4ef38 100644
--- a/tools/testfiles/tsaf.h5.xml
+++ b/tools/testfiles/tsaf.h5.xml
@@ -307,6 +307,295 @@ Expected output for 'h5dump --xml tsaf.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>
+ <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>
+ <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+ <hdf5:FillValue>
+ <hdf5:NoFill/>
+ </hdf5:FillValue>
+ </hdf5:FillValueInfo>
+ <hdf5:Dataspace>
+ <hdf5:SimpleDataspace Ndims="1">
+ <hdf5:Dimension DimSize="1" MaxDimSize="1"/>
+ </hdf5:SimpleDataspace>
+ </hdf5:Dataspace>
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="magic">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="SFileDir">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="ImportFile">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="parallel">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="safapi">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="vmajor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="vminor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="rel">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="annot">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="saflib">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="vmajor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="vminor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="rel">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="annot">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="vbt">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="vmajor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="vminor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="rel">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="annot">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="dsl">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="vmajor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="vminor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="rel">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="annot">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="hdf5">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="vmajor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="vminor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="rel">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="annot">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="mpi">
+ <hdf5:DataType>
+ <hdf5:CompoundType>
+ <hdf5:Field FieldName="vmajor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="vminor">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="rel">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="annot">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="DoToc">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="ReadOnly">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="Clobber">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ <hdf5:Field FieldName="OSModes">
+ <hdf5:DataType>
+ <hdf5:AtomicType>
+ <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+ </hdf5:AtomicType>
+ </hdf5:DataType>
+ </hdf5:Field>
+ </hdf5:CompoundType>
+ </hdf5:DataType>
+ <!-- Note: format of compound data not specified -->
+ <hdf5:Data>
+ <hdf5:DataFromFile>
+ -604320037 "." "don't import" 1 0 0 0 "none" 0 1 0 "devel" 1 3 0 "" 0 0 0 "none" 1 2 1 "" 1 2 0 "" 1 0 1 0
+ </hdf5:DataFromFile>
+ </hdf5:Data>
+ </hdf5:Dataset>
+ </hdf5:Group>
+ </hdf5:Group>
<hdf5:Dataset Name="Blob" OBJ-XID="xid_17612" H5Path= "/Blob" Parents="xid_696" H5ParentPaths="/">
<hdf5:StorageLayout>
<hdf5:ChunkedLayout Ndims="1">
@@ -2628,294 +2917,5 @@ Expected output for 'h5dump --xml tsaf.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>
- <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>
- <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
- <hdf5:FillValue>
- <hdf5:NoFill/>
- </hdf5:FillValue>
- </hdf5:FillValueInfo>
- <hdf5:Dataspace>
- <hdf5:SimpleDataspace Ndims="1">
- <hdf5:Dimension DimSize="1" MaxDimSize="1"/>
- </hdf5:SimpleDataspace>
- </hdf5:Dataspace>
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="magic">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="SFileDir">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="ImportFile">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="parallel">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="safapi">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="vmajor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="vminor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="rel">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="annot">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="saflib">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="vmajor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="vminor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="rel">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="annot">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="vbt">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="vmajor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="vminor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="rel">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="annot">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="dsl">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="vmajor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="vminor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="rel">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="annot">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="hdf5">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="vmajor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="vminor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="rel">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="annot">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="mpi">
- <hdf5:DataType>
- <hdf5:CompoundType>
- <hdf5:Field FieldName="vmajor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="vminor">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="rel">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="annot">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="DoToc">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="ReadOnly">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="Clobber">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- <hdf5:Field FieldName="OSModes">
- <hdf5:DataType>
- <hdf5:AtomicType>
- <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
- </hdf5:AtomicType>
- </hdf5:DataType>
- </hdf5:Field>
- </hdf5:CompoundType>
- </hdf5:DataType>
- <!-- Note: format of compound data not specified -->
- <hdf5:Data>
- <hdf5:DataFromFile>
- -604320037 "." "don't import" 1 0 0 0 "none" 0 1 0 "devel" 1 3 0 "" 0 0 0 "none" 1 2 1 "" 1 2 0 "" 1 0 1 0
- </hdf5:DataFromFile>
- </hdf5:Data>
- </hdf5:Dataset>
- </hdf5:Group>
- </hdf5:Group>
</hdf5:RootGroup>
</hdf5:HDF5-File>
diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/testfiles/tvlstr.h5.xml
index 8a0a180..98a3b30 100644
--- a/tools/testfiles/tvlstr.h5.xml
+++ b/tools/testfiles/tvlstr.h5.xml
@@ -15,13 +15,6 @@ Expected output for 'h5dump --xml tvlstr.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Attribute>
- <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" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
@@ -53,5 +46,12 @@ Expected output for 'h5dump --xml tvlstr.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>
+ <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:RootGroup>
</hdf5:HDF5-File>