[svn-r26297] Changed example and h5dump according to suggestions at today's code review VDS-176.

BNF has been updated too. Now h5dump displays VDS like this:

HDF5 "vds.h5" {
GROUP "/" {
   DATASET "VDS" {
      DATATYPE  H5T_STD_I32LE
      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
      STORAGE_LAYOUT {
         VIRTUAL {
             HYPERSLAB { (0,0)-(0,5) };
             a.h5;
             A;
             ALL;
             HYPERSLAB { (1,0)-(1,5) };
             b.h5;
             B;
             ALL;
             HYPERSLAB { (2,0)-(2,5) };
             c.h5;
             C;
             ALL;
            }
         }
      }
      FILTERS {
.......
I just commented the code with "EIP" and didn't delete to simplify the review with Allen tomorrow.

Tested on jam

3 files changed, 17 insertions, 10 deletions

diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 6dc93fd..9e1fd55 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -94,7 +94,10 @@
 #define PACKED_OFFSET   "OFFSET"
 #define PACKED_LENGTH   "LENGTH"
 #define VDS_VIRTUAL     "VIRTUAL"
+/* EIP
 #define VDS_MAPPING     "MAPPING"
+*/
+/* It looks like two definitions below are not used */
 #define VDS_HYPERSLAB   "HYPERSLAB_SELECTION"
 #define VDS_POINT       "POINT_SELECTION"
 
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index d2d895b..3b7b313 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2866,25 +2866,25 @@ h5tools_print_virtual_selection(h5tools_str_t *buffer, const h5tool_format_t *in
     h5tools_str_append(buffer, "%s ", h5tools_dump_header_format->virtualselectionbegin);
     switch(H5Sget_select_type(vspace)) {
     case H5S_SEL_NONE:    /* Nothing selected         */
-        h5tools_str_append(buffer, "H5S_NONE");
+        h5tools_str_append(buffer, "NONE");
         break;
     case H5S_SEL_POINTS:    /* Sequence of points selected  */
-        h5tools_str_append(buffer, "POINT_SELECTION %s ", h5tools_dump_header_format->virtualselectionblockbegin);
+        h5tools_str_append(buffer, "POINT %s ", h5tools_dump_header_format->virtualselectionblockbegin);
         h5tools_str_dump_space_points(buffer, vspace, info);
-        h5tools_str_append(buffer, "%s", h5tools_dump_header_format->virtualselectionblockend);
+        h5tools_str_append(buffer, "% s", h5tools_dump_header_format->virtualselectionblockend);
         break;
     case H5S_SEL_HYPERSLABS:    /* "New-style" hyperslab selection defined  */
-        h5tools_str_append(buffer, "HYPERSLAB_SELECTION %s ", h5tools_dump_header_format->virtualselectionblockbegin);
+        h5tools_str_append(buffer, "HYPERSLAB %s ", h5tools_dump_header_format->virtualselectionblockbegin);
         h5tools_str_dump_space_blocks(buffer, vspace, info);
-        h5tools_str_append(buffer, "%s", h5tools_dump_header_format->virtualselectionblockend);
+        h5tools_str_append(buffer, "% s", h5tools_dump_header_format->virtualselectionblockend);
         break;
     case H5S_SEL_ALL:    /* Entire extent selected   */
-        h5tools_str_append(buffer, "H5S_ALL");
+        h5tools_str_append(buffer, "ALL");
         break;
     default:
         h5tools_str_append(buffer, "Unknown Selection");
     }
-    h5tools_str_append(buffer, " %s", h5tools_dump_header_format->virtualselectionend);
+    h5tools_str_append(buffer, "%s", h5tools_dump_header_format->virtualselectionend);
 }
 
 
@@ -3173,13 +3173,15 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
             ctx->indent_level++;
 
             ctx->need_prefix = TRUE;
-            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-
+/* EIP           h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+*/
             h5tools_str_reset(&buffer);
+/* EIP
             h5tools_str_append(&buffer, "%s %s", VDS_MAPPING, BEGIN);
             h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
             ctx->indent_level++;
+*/
             for(next = 0; next < (unsigned)vmaps; next++) {
                 hid_t virtual_vspace = H5Pget_virtual_vspace(dcpl_id, next);
                 hid_t virtual_srcspace = H5Pget_virtual_srcspace(dcpl_id, next);
@@ -3221,7 +3223,9 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                 h5tools_print_virtual_selection(&buffer, info, virtual_srcspace, dcpl_id, next);
                 h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
             }
+/* EIP
             ctx->indent_level--;
+*/
 
             ctx->need_prefix = TRUE;
             h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 45424f6..d0ecc6e 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -469,7 +469,7 @@ h5tools_str_dump_space_blocks(h5tools_str_t *str, hid_t rspace,
                 h5tools_str_append(str, "%s" HSIZE_T_FORMAT, j ? "," : ")-(",
                                     ptdata[i * 2 * ndims + j + ndims]);
 
-            h5tools_str_append(str, ")");
+            h5tools_str_append(str, ") ");
         }
 
         HDfree(ptdata);