[svn-r17493] Bring changes from trunk to tools lib, h5dump and error handling.

Tested: h5committest, local linux

6 files changed, 176 insertions, 28 deletions

diff --git a/tools/testfiles/tattrreg.ddl b/tools/testfiles/tattrreg.ddl
new file mode 100644
index 0000000..5b64b18
--- /dev/null
+++ b/tools/testfiles/tattrreg.ddl
@@ -0,0 +1,38 @@
+#############################
+Expected output for 'h5dump tattrreg.h5'
+#############################
+HDF5 "tattrreg.h5" {
+GROUP "/" {
+   DATASET "Dataset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  NULL
+      DATA {
+      }
+      ATTRIBUTE "Attribute1" {
+         DATATYPE  H5T_REFERENCE
+         DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+         DATA {
+         (0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9),
+         (1):  (2,2), (8,4), (1,6), (2,8), (3,2), (0,4), (9,0), (7,1),
+         (1):  (3,3)}, NULL, NULL
+         }
+      }
+   }
+   DATASET "Dataset2" {
+      DATATYPE  H5T_STD_U8BE
+      DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+      DATA {
+      (0,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
+      (1,0): 30, 33, 36, 39, 42, 45, 48, 51, 54, 57,
+      (2,0): 60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
+      (3,0): 90, 93, 96, 99, 102, 105, 108, 111, 114, 117,
+      (4,0): 120, 123, 126, 129, 132, 135, 138, 141, 144, 147,
+      (5,0): 150, 153, 156, 159, 162, 165, 168, 171, 174, 177,
+      (6,0): 180, 183, 186, 189, 192, 195, 198, 201, 204, 207,
+      (7,0): 210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
+      (8,0): 240, 243, 246, 249, 252, 255, 2, 5, 8, 11,
+      (9,0): 14, 17, 20, 23, 26, 29, 32, 35, 38, 41
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tattrreg.h5 b/tools/testfiles/tattrreg.h5
new file mode 100644
index 0000000..193b3e1
--- /dev/null
+++ b/tools/testfiles/tattrreg.h5
diff --git a/tools/testfiles/tattrregR.ddl b/tools/testfiles/tattrregR.ddl
new file mode 100644
index 0000000..6e399c0
--- /dev/null
+++ b/tools/testfiles/tattrregR.ddl
@@ -0,0 +1,66 @@
+#############################
+Expected output for 'h5dump -R tattrreg.h5'
+#############################
+HDF5 "tattrreg.h5" {
+GROUP "/" {
+   DATASET "Dataset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  NULL
+      DATA {
+      }
+      ATTRIBUTE "Attribute1" {
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+         DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+         DATA {
+         (0): DATASET /Dataset2 {
+            (0): REGION_TYPE BLOCK  (2,2)-(7,7)
+            (0): DATATYPE  H5T_STD_U8BE
+            (0): DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+            (0): DATA { 
+               (2,2): 66, 69, 72, 75, 78, 81,
+               (3,2): 96, 99, 102, 105, 108, 111,
+               (4,2): 126, 129, 132, 135, 138, 141,
+               (5,2): 156, 159, 162, 165, 168, 171,
+               (6,2): 186, 189, 192, 195, 198, 201,
+               (7,2): 216, 219, 222, 225, 228, 231
+            (0):  } 
+         (0): }
+         (1): DATASET /Dataset2  {
+            (1): REGION_TYPE POINT  (6,9), (2,2), (8,4), (1,6), (2,8),
+            (1):  (3,2), (0,4), (9,0), (7,1), (3,3)
+            (1): DATATYPE  H5T_STD_U8BE
+            (1): DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+            (1): DATA { 
+               (6,9): 207,
+               (2,2): 66,
+               (8,4): 252,
+               (1,6): 48,
+               (2,8): 84,
+               (3,2): 96,
+               (0,4): 12,
+               (9,0): 14,
+               (7,1): 213,
+               (3,3): 99
+            (1):  } 
+         (1): }
+         }
+      }
+   }
+   DATASET "Dataset2" {
+      DATATYPE  H5T_STD_U8BE
+      DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+      DATA {
+      (0,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
+      (1,0): 30, 33, 36, 39, 42, 45, 48, 51, 54, 57,
+      (2,0): 60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
+      (3,0): 90, 93, 96, 99, 102, 105, 108, 111, 114, 117,
+      (4,0): 120, 123, 126, 129, 132, 135, 138, 141, 144, 147,
+      (5,0): 150, 153, 156, 159, 162, 165, 168, 171, 174, 177,
+      (6,0): 180, 183, 186, 189, 192, 195, 198, 201, 204, 207,
+      (7,0): 210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
+      (8,0): 240, 243, 246, 249, 252, 255, 2, 5, 8, 11,
+      (9,0): 14, 17, 20, 23, 26, 29, 32, 35, 38, 41
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tdataregR.ddl b/tools/testfiles/tdataregR.ddl
new file mode 100644
index 0000000..2d962ed
--- /dev/null
+++ b/tools/testfiles/tdataregR.ddl
@@ -0,0 +1,60 @@
+#############################
+Expected output for 'h5dump -R tdatareg.h5'
+#############################
+HDF5 "tdatareg.h5" {
+GROUP "/" {
+   DATASET "Dataset1" {
+      DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): DATASET /Dataset2 {
+         (0): REGION_TYPE BLOCK  (2,2)-(7,7)
+         (0): DATATYPE  H5T_STD_U8BE
+         (0): DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+         (0): DATA { 
+            (2,2): 66, 69, 72, 75, 78, 81,
+            (3,2): 96, 99, 102, 105, 108, 111,
+            (4,2): 126, 129, 132, 135, 138, 141,
+            (5,2): 156, 159, 162, 165, 168, 171,
+            (6,2): 186, 189, 192, 195, 198, 201,
+            (7,2): 216, 219, 222, 225, 228, 231
+         (0):  } 
+      (0): }
+      (1): DATASET /Dataset2  {
+         (1): REGION_TYPE POINT  (6,9), (2,2), (8,4), (1,6), (2,8), (3,2),
+         (1):  (0,4), (9,0), (7,1), (3,3)
+         (1): DATATYPE  H5T_STD_U8BE
+         (1): DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+         (1): DATA { 
+            (6,9): 207,
+            (2,2): 66,
+            (8,4): 252,
+            (1,6): 48,
+            (2,8): 84,
+            (3,2): 96,
+            (0,4): 12,
+            (9,0): 14,
+            (7,1): 213,
+            (3,3): 99
+         (1):  } 
+      (1): }
+      }
+   }
+   DATASET "Dataset2" {
+      DATATYPE  H5T_STD_U8BE
+      DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
+      DATA {
+      (0,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
+      (1,0): 30, 33, 36, 39, 42, 45, 48, 51, 54, 57,
+      (2,0): 60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
+      (3,0): 90, 93, 96, 99, 102, 105, 108, 111, 114, 117,
+      (4,0): 120, 123, 126, 129, 132, 135, 138, 141, 144, 147,
+      (5,0): 150, 153, 156, 159, 162, 165, 168, 171, 174, 177,
+      (6,0): 180, 183, 186, 189, 192, 195, 198, 201, 204, 207,
+      (7,0): 210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
+      (8,0): 240, 243, 246, 249, 252, 255, 2, 5, 8, 11,
+      (9,0): 14, 17, 20, 23, 26, 29, 32, 35, 38, 41
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tdset-3s.ddl b/tools/testfiles/tdset-3s.ddl
index d8deced..5963e90 100644
--- a/tools/testfiles/tdset-3s.ddl
+++ b/tools/testfiles/tdset-3s.ddl
@@ -8,27 +8,10 @@ DATASET "/dset1" {
    SUBSET {
       START ( 1, 1 );
       STRIDE ( 1, 1 );
-      COUNT ( 9, 19 );
+      COUNT ( 1, 1 );
       BLOCK ( 1, 1 );
       DATA {
-      (1,1): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-      (1,19): 20,
-      (2,1):  3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-      (2,18): 20, 21,
-      (3,1):  4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-      (3,18): 21, 22,
-      (4,1):  5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-      (4,18): 22, 23,
-      (5,1):  6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-      (5,18): 23, 24,
-      (6,1):  7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-      (6,17): 23, 24, 25,
-      (7,1):  8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-      (7,17): 24, 25, 26,
-      (8,1):  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
-      (8,17): 25, 26, 27,
-      (9,1):  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-      (9,17): 26, 27, 28
+      (1,1): 2
       }
    }
 }
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
index 594b0c0..5b9299b 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -28,6 +28,7 @@ usage: h5dump [OPTIONS] file
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
+     -R, --region         Print dataset pointed by region references
      -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
@@ -38,14 +39,16 @@ usage: h5dump [OPTIONS] file
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
- The START and COUNT parameters are mandatory if you do subsetting.
- The STRIDE and BLOCK parameters are optional and will default to 1 in
- each dimension.
+ One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
+ The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
+ each dimension. START is optional and will default to 0 in each dimension.
 
-      -s L, --start=L     Offset of start of subsetting selection
-      -S L, --stride=L    Hyperslab stride
-      -c L, --count=L     Number of blocks to include in selection
-      -k L, --block=L     Size of block in hyperslab
+      -s START,  --start=START    Offset of start of subsetting selection
+      -S STRIDE, --stride=STRIDE  Hyperslab stride
+      -c COUNT,  --count=COUNT    Number of blocks to include in selection
+      -k BLOCK,  --block=BLOCK    Size of block in hyperslab
+  START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the
+        number of dimensions in the dataspace being queried
 
   D - is the file driver to use in opening the file. Acceptable values
         are "sec2", "family", "split", "multi", "direct", and "stream". Without
@@ -56,8 +59,6 @@ usage: h5dump [OPTIONS] file
   P - is the full path from the root group to the object.
   N - is an integer greater than 1.
   T - is a string containing the floating point format, e.g '%.3f'
-  L - is a list of integers the number of which are equal to the
-        number of dimensions in the dataspace being queried
   U - is a URI reference (as defined in [IETF RFC 2396],
         updated by [IETF RFC 2732])
   B - is the form of binary output: NATIVE for a memory type, FILE for the