mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-05 15:42:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r20349] BZ1725: H5DUMP displays type of reference for H5T_REFERENCE

Browse Source 
Tested: local linux
This commit is contained in:
Allen Byrne 2011-03-25 16:19:25 -05:00
parent 378dc5ec28
commit 8656f3a9a5
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/h5dump/h5dump.c
View File

@ -1198,17 +1198,13 @@ print_datatype(hid_t type,unsigned in_group)
case H5T_REFERENCE: case H5T_REFERENCE:
printf("H5T_REFERENCE"); printf("H5T_REFERENCE");
/* The BNF document states that the type of reference should be /* The BNF document states that the type of reference should be
* displayed after "H5T_REFERENCE". Therefore add the missing * displayed after "H5T_REFERENCE". */
* reference type if the region command line option is used. This
* reference type will not be displayed if the region option is not used. */
if(display_region) {
if (H5Tequal(type, H5T_STD_REF_DSETREG)==TRUE) { if (H5Tequal(type, H5T_STD_REF_DSETREG)==TRUE) {
printf(" { H5T_STD_REF_DSETREG }"); printf(" { H5T_STD_REF_DSETREG }");
} }
else { else {
printf(" { H5T_STD_REF_OBJECT }"); printf(" { H5T_STD_REF_OBJECT }");
} }
}
break; break;
case H5T_ENUM: case H5T_ENUM:

2
tools/testfiles/tattrreg.ddl
View File

@ -9,7 +9,7 @@ GROUP "/" {
DATA { DATA {
} }
ATTRIBUTE "Attribute1" { ATTRIBUTE "Attribute1" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_DSETREG }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA { DATA {
(0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9),

2
tools/testfiles/tdatareg.ddl
View File

@ -4,7 +4,7 @@ Expected output for 'h5dump tdatareg.h5'
HDF5 "tdatareg.h5" { HDF5 "tdatareg.h5" {
GROUP "/" { GROUP "/" {
DATASET "Dataset1" { DATASET "Dataset1" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_DSETREG }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA { DATA {
DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2), DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2),

12
tools/testfiles/treference.ddl
View File

@ -853,14 +853,14 @@ GROUP "/" {
} }
} }
ATTRIBUTE "reference" { ATTRIBUTE "reference" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA { DATA {
(0): DATASET 976 /dset , DATASET 976 /dset (0): DATASET 976 /dset , DATASET 976 /dset
} }
} }
ATTRIBUTE "reference2D" { ATTRIBUTE "reference2D" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
DATA { DATA {
(0,0): DATASET 976 /dset , DATASET 976 /dset , (0,0): DATASET 976 /dset , DATASET 976 /dset ,
@ -869,7 +869,7 @@ GROUP "/" {
} }
} }
ATTRIBUTE "reference3D" { ATTRIBUTE "reference3D" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
DATA { DATA {
(0,0,0): DATASET 976 /dset , DATASET 976 /dset , (0,0,0): DATASET 976 /dset , DATASET 976 /dset ,
@ -1817,14 +1817,14 @@ GROUP "/" {
} }
} }
DATASET "reference" { DATASET "reference" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA { DATA {
(0): DATASET 976 /dset , DATASET 976 /dset (0): DATASET 976 /dset , DATASET 976 /dset
} }
} }
DATASET "reference2D" { DATASET "reference2D" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
DATA { DATA {
(0,0): DATASET 976 /dset , DATASET 976 /dset , (0,0): DATASET 976 /dset , DATASET 976 /dset ,
@ -1833,7 +1833,7 @@ GROUP "/" {
} }
} }
DATASET "reference3D" { DATASET "reference3D" {
DATATYPE H5T_REFERENCE DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
DATA { DATA {
(0,0,0): DATASET 976 /dset , DATASET 976 /dset , (0,0,0): DATASET 976 /dset , DATASET 976 /dset ,