[svn-r8643] Purpose:

h5dump new features

Description:
added the code for print strings with new line and display the path of references (new source files h5tools_ref.c and .h )
added a test suite in testh5dump.sh.in for
( note : to create testh5dump.sh , one must redo ./configure; this detects the availability of filters
and generates  testh5dump.sh accordingly)
1) storage layout
2) fill value
3) print reference with path
4) print strings with new lines
5) filters



Solution:

Platforms tested:
linux
solaris
AIX


Misc. update:

14 files changed, 224 insertions, 0 deletions

diff --git a/tools/testfiles/tchunked.ddl b/tools/testfiles/tchunked.ddl
new file mode 100644
index 0000000..5d4571b
--- /dev/null
+++ b/tools/testfiles/tchunked.ddl
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5dump -H -p -d chunked tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+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 )
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tcompact.ddl b/tools/testfiles/tcompact.ddl
new file mode 100644
index 0000000..ae4f3e7
--- /dev/null
+++ b/tools/testfiles/tcompact.ddl
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5dump -H -p -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 ) }
+   STORAGE_LAYOUT COMPACT {
+      SIZE 800
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME EARLY
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tcontiguos.ddl b/tools/testfiles/tcontiguos.ddl
new file mode 100644
index 0000000..7c26099
--- /dev/null
+++ b/tools/testfiles/tcontiguos.ddl
@@ -0,0 +1,8 @@
+#############################
+Expected output for 'h5dump -H -p -d contiguos tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "contiguos" {
+   }
+}
+h5dump error: unable to open dataset "contiguos"
diff --git a/tools/testfiles/tdeflate.ddl b/tools/testfiles/tdeflate.ddl
new file mode 100644
index 0000000..8cc5b3a
--- /dev/null
+++ b/tools/testfiles/tdeflate.ddl
@@ -0,0 +1,20 @@
+#############################
+Expected output for 'h5dump -H -p -d deflate tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "deflate" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 385 ( 10, 5 )
+   }
+   FILTERS {
+      COMPRESSION DEFLATE { LEVEL 9 }
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/texternal.ddl b/tools/testfiles/texternal.ddl
new file mode 100644
index 0000000..511bd4f
--- /dev/null
+++ b/tools/testfiles/texternal.ddl
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5dump -H -p -d external tfilters.h5'
+#############################
+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
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME LATE
+      VALUE  0   
+   }
+}
+}
diff --git a/tools/testfiles/tfillearly.ddl b/tools/testfiles/tfillearly.ddl
new file mode 100644
index 0000000..b48d64f
--- /dev/null
+++ b/tools/testfiles/tfillearly.ddl
@@ -0,0 +1,17 @@
+#############################
+Expected output for 'h5dump -H -p -d fill_early tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "fill_early" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
+   }
+   FILLVALUE {
+      FILL_TIME ALLOC
+      ALLOC_TIME EARLY
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tfillifset.ddl b/tools/testfiles/tfillifset.ddl
new file mode 100644
index 0000000..b67f5c7
--- /dev/null
+++ b/tools/testfiles/tfillifset.ddl
@@ -0,0 +1,17 @@
+#############################
+Expected output for 'h5dump -H -p -d fill_ifset tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "fill_ifset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME EARLY
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tfillnever.ddl b/tools/testfiles/tfillnever.ddl
new file mode 100644
index 0000000..92f19bc
--- /dev/null
+++ b/tools/testfiles/tfillnever.ddl
@@ -0,0 +1,17 @@
+#############################
+Expected output for 'h5dump -H -p -d fill_never tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "fill_never" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
+   }
+   FILLVALUE {
+      FILL_TIME NEVER
+      ALLOC_TIME EARLY
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tfletcher32.ddl b/tools/testfiles/tfletcher32.ddl
new file mode 100644
index 0000000..4e44439
--- /dev/null
+++ b/tools/testfiles/tfletcher32.ddl
@@ -0,0 +1,20 @@
+#############################
+Expected output for 'h5dump -H -p -d fletcher32 tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "fletcher32" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 816 ( 10, 5 )
+   }
+   FILTERS {
+      CHECKSUM FLETCHER32
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/treference.ddl b/tools/testfiles/treference.ddl
new file mode 100644
index 0000000..754a840
--- /dev/null
+++ b/tools/testfiles/treference.ddl
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5dump -d reference tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "reference" {
+   DATATYPE  H5T_REFERENCE
+   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
+   DATA {
+        (0) DATASET 0:976 /compact , DATATYPE 0:15955 /myvlen ,
+        (2) DATASET 0:976 /compact , DATATYPE 0:15955 /myvlen ,
+        (4) DATASET 0:2376 /contiguous 
+   }
+}
+}
diff --git a/tools/testfiles/tshuffle.ddl b/tools/testfiles/tshuffle.ddl
new file mode 100644
index 0000000..c68668c
--- /dev/null
+++ b/tools/testfiles/tshuffle.ddl
@@ -0,0 +1,20 @@
+#############################
+Expected output for 'h5dump -H -p -d shuffle tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "shuffle" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
+   }
+   FILTERS {
+      PREPROCESSING SHUFFLE
+   }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
+}
diff --git a/tools/testfiles/tstring.ddl b/tools/testfiles/tstring.ddl
new file mode 100644
index 0000000..d6df34b
--- /dev/null
+++ b/tools/testfiles/tstring.ddl
@@ -0,0 +1,20 @@
+#############################
+Expected output for 'h5dump -e -d string tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "string" {
+   DATATYPE  H5T_STRING {
+         STRSIZE 57;
+         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"
+   }
+}
+}
diff --git a/tools/testfiles/tszip.ddl b/tools/testfiles/tszip.ddl
new file mode 100644
index 0000000..02a5fd3
--- /dev/null
+++ b/tools/testfiles/tszip.ddl
@@ -0,0 +1,8 @@
+#############################
+Expected output for 'h5dump -H -p -d szip tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "szip" {
+   }
+}
+h5dump error: unable to open dataset "szip"
diff --git a/tools/testfiles/tuserfilter.ddl b/tools/testfiles/tuserfilter.ddl
new file mode 100644
index 0000000..c262fb6
--- /dev/null
+++ b/tools/testfiles/tuserfilter.ddl
@@ -0,0 +1,9 @@
+#############################
+Expected output for 'h5dump -H -d myfilter tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+DATASET "myfilter" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+}
+}