[svn-r8715] Purpose:

h5dump output change, new tests

Description:
the storage layout output format the storage layout output format  had some changes
same for the user defined filter
add an option (-y) for not printing the array indices (default is print indices )
the option for escaping non printable characters covers all characters (default is not escape)
(this might be not very portable, the test files are  tstring.ddl and tstringe.ddl )
add tests for the new options


Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

23 files changed, 250 insertions, 53 deletions

diff --git a/tools/testfiles/tallfilters.ddl b/tools/testfiles/tallfilters.ddl
new file mode 100644
index 0000000..3d5833f
--- /dev/null
+++ b/tools/testfiles/tallfilters.ddl
@@ -0,0 +1,30 @@
+#############################
+Expected output for 'h5dump -H -p -d all tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "all" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 458
+    }
+   FILTERS {
+      PREPROCESSING SHUFFLE
+      COMPRESSION SZIP {
+         PIXELS_PER_BLOCK 4
+         MODE HARDWARE
+         CODING ENTROPY
+         BYTE_ORDER LSB
+         HEADER RAW
+      }
+      COMPRESSION DEFLATE { LEVEL 5 }
+      CHECKSUM FLETCHER32
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tchunked.ddl b/tools/testfiles/tchunked.ddl
index 5d4571b..d5b5a33 100644
--- a/tools/testfiles/tchunked.ddl
+++ b/tools/testfiles/tchunked.ddl
@@ -6,9 +6,10 @@ DATASET "chunked" {
 COMMENT "This is a dataset with chunked storage"
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 800 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
    FILLVALUE {
       FILL_TIME IFSET
       ALLOC_TIME INCR
diff --git a/tools/testfiles/tcompact.ddl b/tools/testfiles/tcompact.ddl
index ae4f3e7..cbf499f 100644
--- a/tools/testfiles/tcompact.ddl
+++ b/tools/testfiles/tcompact.ddl
@@ -6,7 +6,8 @@ DATASET "compact" {
 COMMENT "This is a dataset with compact storage"
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT COMPACT {
+   STORAGE_LAYOUT {
+      COMPACT
       SIZE 800
    }
    FILLVALUE {
diff --git a/tools/testfiles/tcontents.ddl b/tools/testfiles/tcontents.ddl
index 5e5b683..825e29b 100644
--- a/tools/testfiles/tcontents.ddl
+++ b/tools/testfiles/tcontents.ddl
@@ -4,6 +4,9 @@ Expected output for 'h5dump -n tfilters.h5'
 HDF5 "tfilters.h5" {
 FILE_CONTENTS {
  dataset    /all
+ dataset    /alloc_time_early
+ dataset    /alloc_time_incr
+ dataset    /alloc_time_late
  dataset    /bitfield
  dataset    /char
  dataset    /chunked
@@ -12,10 +15,13 @@ FILE_CONTENTS {
  dataset    /deflate
  dataset    /enum
  dataset    /external
- dataset    /fill_early
- dataset    /fill_ifset
- dataset    /fill_never
+ dataset    /fill_time_alloc
+ dataset    /fill_time_ifset
+ dataset    /fill_time_never
  dataset    /fletcher32
+ group      /g1
+ dataset    /g1/mydset
+ link       /g1/slink
  dataset    /myfilter
  datatype   /mytype
  datatype   /myvlen
diff --git a/tools/testfiles/tdeflate.ddl b/tools/testfiles/tdeflate.ddl
index 8cc5b3a..bf36454 100644
--- a/tools/testfiles/tdeflate.ddl
+++ b/tools/testfiles/tdeflate.ddl
@@ -5,9 +5,10 @@ HDF5 "tfilters.h5" {
 DATASET "deflate" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 385 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 385
+    }
    FILTERS {
       COMPRESSION DEFLATE { LEVEL 9 }
    }
diff --git a/tools/testfiles/texternal.ddl b/tools/testfiles/texternal.ddl
index 511bd4f..60eb0a8 100644
--- a/tools/testfiles/texternal.ddl
+++ b/tools/testfiles/texternal.ddl
@@ -5,9 +5,12 @@ HDF5 "tfilters.h5" {
 DATASET "external" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 100 ) / ( 100 ) }
-   STORAGE_LAYOUT CONTIGUOUS EXTERNAL {
-      FILENAME ext1.bin SIZE 200 OFFSET 0
-      FILENAME ext2.bin SIZE 200 OFFSET 0
+   STORAGE_LAYOUT {
+      CONTIGUOUS
+      EXTERNAL {
+         FILENAME ext1.bin SIZE 200 OFFSET 0
+         FILENAME ext2.bin SIZE 200 OFFSET 0
+      }
    }
    FILLVALUE {
       FILL_TIME IFSET
diff --git a/tools/testfiles/tfillalloc.ddl b/tools/testfiles/tfillalloc.ddl
new file mode 100644
index 0000000..82fe21a
--- /dev/null
+++ b/tools/testfiles/tfillalloc.ddl
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5dump -H -p -d fill_time_alloc tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "fill_time_alloc" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
+   FILLVALUE {
+      FILL_TIME ALLOC
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tfillearly.ddl b/tools/testfiles/tfillearly.ddl
index b48d64f..3f9217e 100644
--- a/tools/testfiles/tfillearly.ddl
+++ b/tools/testfiles/tfillearly.ddl
@@ -1,15 +1,16 @@
 #############################
-Expected output for 'h5dump -H -p -d fill_early tfilters.h5'
+Expected output for 'h5dump -H -p -d alloc_time_early tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
-DATASET "fill_early" {
+DATASET "alloc_time_early" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 800 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
    FILLVALUE {
-      FILL_TIME ALLOC
+      FILL_TIME IFSET
       ALLOC_TIME EARLY
       VALUE  -99   
    }
diff --git a/tools/testfiles/tfillifset.ddl b/tools/testfiles/tfillifset.ddl
index b67f5c7..1cb9527 100644
--- a/tools/testfiles/tfillifset.ddl
+++ b/tools/testfiles/tfillifset.ddl
@@ -1,16 +1,17 @@
 #############################
-Expected output for 'h5dump -H -p -d fill_ifset tfilters.h5'
+Expected output for 'h5dump -H -p -d fill_time_ifset tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
-DATASET "fill_ifset" {
+DATASET "fill_time_ifset" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 800 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
    FILLVALUE {
       FILL_TIME IFSET
-      ALLOC_TIME EARLY
+      ALLOC_TIME INCR
       VALUE  -99   
    }
 }
diff --git a/tools/testfiles/tfillincr.ddl b/tools/testfiles/tfillincr.ddl
new file mode 100644
index 0000000..f8df5a9
--- /dev/null
+++ b/tools/testfiles/tfillincr.ddl
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5dump -H -p -d alloc_time_incr tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "alloc_time_incr" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tfilllate.ddl b/tools/testfiles/tfilllate.ddl
new file mode 100644
index 0000000..6f8eafc
--- /dev/null
+++ b/tools/testfiles/tfilllate.ddl
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5dump -H -p -d alloc_time_late tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "alloc_time_late" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME LATE
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tfillnever.ddl b/tools/testfiles/tfillnever.ddl
index 92f19bc..9b1f4b9 100644
--- a/tools/testfiles/tfillnever.ddl
+++ b/tools/testfiles/tfillnever.ddl
@@ -1,16 +1,17 @@
 #############################
-Expected output for 'h5dump -H -p -d fill_never tfilters.h5'
+Expected output for 'h5dump -H -p -d fill_time_never tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
-DATASET "fill_never" {
+DATASET "fill_time_never" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 800 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
    FILLVALUE {
       FILL_TIME NEVER
-      ALLOC_TIME EARLY
+      ALLOC_TIME INCR
       VALUE  -99   
    }
 }
diff --git a/tools/testfiles/tfilters.h5 b/tools/testfiles/tfilters.h5
index 7f19ad4..39eac41 100644
--- a/tools/testfiles/tfilters.h5
+++ b/tools/testfiles/tfilters.h5
diff --git a/tools/testfiles/tfletcher32.ddl b/tools/testfiles/tfletcher32.ddl
index 4e44439..b269eed 100644
--- a/tools/testfiles/tfletcher32.ddl
+++ b/tools/testfiles/tfletcher32.ddl
@@ -5,9 +5,10 @@ HDF5 "tfilters.h5" {
 DATASET "fletcher32" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 816 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 816
+    }
    FILTERS {
       CHECKSUM FLETCHER32
    }
diff --git a/tools/testfiles/tindicesno.ddl b/tools/testfiles/tindicesno.ddl
new file mode 100644
index 0000000..4b8ff7d
--- /dev/null
+++ b/tools/testfiles/tindicesno.ddl
@@ -0,0 +1,32 @@
+#############################
+Expected output for 'h5dump -y -d compact tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "compact" {
+COMMENT "This is a dataset with compact storage"
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   DATA {
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+      10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+      20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+      30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+      40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+      50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+      60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+      70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+      80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+      90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+      100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+      110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+      120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+      130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+      140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+      150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+      160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+      170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+      180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+      190, 191, 192, 193, 194, 195, 196, 197, 198, 199
+   }
+}
+}
diff --git a/tools/testfiles/tindicesyes.ddl b/tools/testfiles/tindicesyes.ddl
new file mode 100644
index 0000000..41d1c88
--- /dev/null
+++ b/tools/testfiles/tindicesyes.ddl
@@ -0,0 +1,32 @@
+#############################
+Expected output for 'h5dump -d compact tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "compact" {
+COMMENT "This is a dataset with compact storage"
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   DATA {
+        (0,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+        (1,0) 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+        (2,0) 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+        (3,0) 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+        (4,0) 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+        (5,0) 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+        (6,0) 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+        (7,0) 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+        (8,0) 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+        (9,0) 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+        (10,0) 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+        (11,0) 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+        (12,0) 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+        (13,0) 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+        (14,0) 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+        (15,0) 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+        (16,0) 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+        (17,0) 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+        (18,0) 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+        (19,0) 190, 191, 192, 193, 194, 195, 196, 197, 198, 199
+   }
+}
+}
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
index 56dd4b9..36cbcad 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -10,10 +10,11 @@ usage: h5dump [OPTIONS] file
      -A                   Print the header and value of attributes; data of datasets is not displayed
      -i, --object-ids     Print the object ids
      -r, --string         Print 1-byte integer datasets as ASCII
-     -e,                  Interpret carriage return (\n) as new line
+     -e,                  Escape non printing characters
      -V, --version        Print version number and exit
      -a P, --attribute=P  Print the specified attribute
      -d P, --dataset=P    Print the specified dataset
+     -y                   Do not print array indices with the data
      -p,   --properties   Print dataset filters, storage layout and fill value
      -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
diff --git a/tools/testfiles/treference.ddl b/tools/testfiles/treference.ddl
index 951f213..2ebfeef 100644
--- a/tools/testfiles/treference.ddl
+++ b/tools/testfiles/treference.ddl
@@ -4,11 +4,9 @@ Expected output for 'h5dump -d reference tfilters.h5'
 HDF5 "tfilters.h5" {
 DATASET "reference" {
    DATATYPE  H5T_REFERENCE
-   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
+   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
    DATA {
-        (0) DATASET 976 /compact , DATATYPE 4008 /myvlen ,
-        (2) DATASET 976 /compact , DATATYPE 4008 /myvlen ,
-        (4) DATASET 2376 /contiguous 
+        (0) DATASET 60656 /g1/mydset 
    }
 }
 }
diff --git a/tools/testfiles/tshuffle.ddl b/tools/testfiles/tshuffle.ddl
index c68668c..d3995dc 100644
--- a/tools/testfiles/tshuffle.ddl
+++ b/tools/testfiles/tshuffle.ddl
@@ -5,9 +5,10 @@ HDF5 "tfilters.h5" {
 DATASET "shuffle" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 800 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
    FILTERS {
       PREPROCESSING SHUFFLE
    }
diff --git a/tools/testfiles/tstring.ddl b/tools/testfiles/tstring.ddl
index 241f04e..2a60e1d 100644
--- a/tools/testfiles/tstring.ddl
+++ b/tools/testfiles/tstring.ddl
@@ -1,20 +1,20 @@
 #############################
-Expected output for 'h5dump -e -d string tfilters.h5'
+Expected output for 'h5dump -d string tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
 DATASET "string" {
    DATATYPE  H5T_STRING {
-         STRSIZE 59;
+         STRSIZE 73;
          STRPAD H5T_STR_NULLTERM;
          CSET H5T_CSET_ASCII;
          CTYPE H5T_C_S1;
       }
    DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
    DATA {
-        (0) "this is
-            a string 	with three
-            newline
-            escape 	characters"
+        (0) "quote "  backspace form feed new line
+            tab	 new line
+            carriage return
+           "
    }
 }
 }
diff --git a/tools/testfiles/tstringe.ddl b/tools/testfiles/tstringe.ddl
new file mode 100644
index 0000000..4e97359
--- /dev/null
+++ b/tools/testfiles/tstringe.ddl
@@ -0,0 +1,17 @@
+#############################
+Expected output for 'h5dump -e -d string tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "string" {
+   DATATYPE  H5T_STRING {
+         STRSIZE 73;
+         STRPAD H5T_STR_NULLTERM;
+         CSET H5T_CSET_ASCII;
+         CTYPE H5T_C_S1;
+      }
+   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+   DATA {
+        (0) "quote \"  backspace\b form feed\f new line\n tab\t new line\n carriage return\r"
+   }
+}
+}
diff --git a/tools/testfiles/tszip.ddl b/tools/testfiles/tszip.ddl
index 99ed2c9..d7812c3 100644
--- a/tools/testfiles/tszip.ddl
+++ b/tools/testfiles/tszip.ddl
@@ -5,9 +5,10 @@ HDF5 "tfilters.h5" {
 DATASET "szip" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT CHUNKED {
-      SIZE 372 ( 10, 5 )
-   }
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 372
+    }
    FILTERS {
       COMPRESSION SZIP {
          PIXELS_PER_BLOCK 4
diff --git a/tools/testfiles/tuserfilter.ddl b/tools/testfiles/tuserfilter.ddl
index c262fb6..5ec981a 100644
--- a/tools/testfiles/tuserfilter.ddl
+++ b/tools/testfiles/tuserfilter.ddl
@@ -1,9 +1,24 @@
 #############################
-Expected output for 'h5dump -H -d myfilter tfilters.h5'
+Expected output for 'h5dump -H -p -d myfilter tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
 DATASET "myfilter" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-}
+   STORAGE_LAYOUT {
+      CHUNKED ( 10, 5 )
+      SIZE 800
+    }
+   FILTERS {
+      UNKNOWN_FILTER {
+         FILTER_ID 405
+         COMMENT myfilter
+         PARAMS { 5 6 }
+      }
+      FILLVALUE {
+         FILL_TIME IFSET
+         ALLOC_TIME INCR
+         VALUE  -99      
+      }
+   }
 }