diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-08-07 15:15:04 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-08-07 15:15:04 (GMT) |
| commit | a5de140500d6655c80272b82c748a23440539273 (patch) | |
| tree | 24d48813534f2bdcf89d5337f74c704d7333fb02 /tools | |
| parent | c3bdc280620f4452207253904368c113029e5da8 (diff) | |
| download | hdf5-a5de140500d6655c80272b82c748a23440539273.zip hdf5-a5de140500d6655c80272b82c748a23440539273.tar.gz hdf5-a5de140500d6655c80272b82c748a23440539273.tar.bz2 | |
[svn-r15446] bug fix
http://bugzilla.hdfgroup.uiuc.edu/show_bug.cgi?id=788
don't print array indices for regions
tested: windows, linux
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/h5dump.c | 15 | ||||
| -rw-r--r-- | tools/testfiles/tdatareg.ddl | 5 |
2 files changed, 16 insertions, 4 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index aa44cc1..2e03a25 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -2216,6 +2216,20 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index) outputformat->do_escape=display_escape; /* print the matrix indices */ outputformat->pindex=display_index; + + /* do not print indices for regions */ + if(obj_data == DATASET_DATA) + { + hid_t f_type = H5Dget_type(obj_id); + + if (H5Tequal(f_type, H5T_STD_REF_DSETREG)) + { + outputformat->pindex = 0; + } + H5Tclose(f_type); + } + + if (outputformat->pindex) { outputformat->idx_fmt = "(%s): "; outputformat->idx_n_fmt = HSIZE_T_FORMAT; @@ -2280,7 +2294,6 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index) outputformat = &string_dataformat; } - status = h5tools_dump_dset(stdout, outputformat, obj_id, -1, sset, depth); H5Tclose(f_type); diff --git a/tools/testfiles/tdatareg.ddl b/tools/testfiles/tdatareg.ddl index 32a1601..ea85fb9 100644 --- a/tools/testfiles/tdatareg.ddl +++ b/tools/testfiles/tdatareg.ddl @@ -7,9 +7,8 @@ GROUP "/" { DATATYPE H5T_REFERENCE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2), - (1): (8,4), (1,6), (2,8), (3,2), (0,4), (9,0), (7,1), (3,3)}, NULL, - (3): NULL + DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2), + (8,4), (1,6), (2,8), (3,2), (0,4), (9,0), (7,1), (3,3)}, NULL, NULL } } DATASET "Dataset2" { |