[svn-r8622] Purpose:

h5dump new version

Description:
added the changes already made for 1.6
support for dumping of
1) filters
2) storage layout
3) fill value
4) comments
5) superblock
6) file contents
7) array indices


Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

1 files changed, 209 insertions, 209 deletions

diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl
index b656f23..5cbd67c 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/testfiles/tcomp-1.ddl
@@ -15,27 +15,27 @@ GROUP "/" {
       }
       DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
       DATA {
-         {
+        (0) {
             0,
             0,
             1
          },
-         {
+        (1) {
             1,
             1,
             0.5
          },
-         {
+        (2) {
             2,
             4,
             0.333333
          },
-         {
+        (3) {
             3,
             9,
             0.25
          },
-         {
+        (4) {
             4,
             16,
             0.2
@@ -47,202 +47,202 @@ GROUP "/" {
          DATATYPE  "/type1"
          DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
          DATA {
-            {
-               0,
-               0
-            },
-            {
-               1,
-               1.1
-            },
-            {
-               2,
-               2.2
-            },
-            {
-               3,
-               3.3
-            },
-            {
-               4,
-               4.4
-            }
+        (0) {
+            0,
+            0
+         },
+        (1) {
+            1,
+            1.1
+         },
+        (2) {
+            2,
+            2.2
+         },
+        (3) {
+            3,
+            3.3
+         },
+        (4) {
+            4,
+            4.4
+         }
          }
       }
       DATASET "dset3" {
          DATATYPE  "/type2"
          DATASPACE  SIMPLE { ( 3, 6 ) / ( 3, 6 ) }
          DATA {
-            {
-               [ 0, 1, 2, 3 ],
-               [ 1, 2, 3, 4, 5, 6,
-                  2, 3, 4, 5, 6, 7,
-                  3, 4, 5, 6, 7, 8,
-                  4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10 ]
-            },
-            {
-               [ 1, 2, 3, 4 ],
-               [ 2, 3, 4, 5, 6, 7,
-                  3, 4, 5, 6, 7, 8,
-                  4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11 ]
-            },
-            {
-               [ 2, 3, 4, 5 ],
-               [ 3, 4, 5, 6, 7, 8,
-                  4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12 ]
-            },
-            {
-               [ 3, 4, 5, 6 ],
-               [ 4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13 ]
-            },
-            {
-               [ 4, 5, 6, 7 ],
-               [ 5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14 ]
-            },
-            {
-               [ 5, 6, 7, 8 ],
-               [ 6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14,
-                  10, 11, 12, 13, 14, 15 ]
-            },
-            {
-               [ 1, 2, 3, 4 ],
-               [ 2, 3, 4, 5, 6, 7,
-                  3, 4, 5, 6, 7, 8,
-                  4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11 ]
-            },
-            {
-               [ 2, 3, 4, 5 ],
-               [ 3, 4, 5, 6, 7, 8,
-                  4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12 ]
-            },
-            {
-               [ 3, 4, 5, 6 ],
-               [ 4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13 ]
-            },
-            {
-               [ 4, 5, 6, 7 ],
-               [ 5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14 ]
-            },
-            {
-               [ 5, 6, 7, 8 ],
-               [ 6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14,
-                  10, 11, 12, 13, 14, 15 ]
-            },
-            {
-               [ 6, 7, 8, 9 ],
-               [ 7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14,
-                  10, 11, 12, 13, 14, 15,
-                  11, 12, 13, 14, 15, 16 ]
-            },
-            {
-               [ 2, 3, 4, 5 ],
-               [ 3, 4, 5, 6, 7, 8,
-                  4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12 ]
-            },
-            {
-               [ 3, 4, 5, 6 ],
-               [ 4, 5, 6, 7, 8, 9,
-                  5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13 ]
-            },
-            {
-               [ 4, 5, 6, 7 ],
-               [ 5, 6, 7, 8, 9, 10,
-                  6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14 ]
-            },
-            {
-               [ 5, 6, 7, 8 ],
-               [ 6, 7, 8, 9, 10, 11,
-                  7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14,
-                  10, 11, 12, 13, 14, 15 ]
-            },
-            {
-               [ 6, 7, 8, 9 ],
-               [ 7, 8, 9, 10, 11, 12,
-                  8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14,
-                  10, 11, 12, 13, 14, 15,
-                  11, 12, 13, 14, 15, 16 ]
-            },
-            {
-               [ 7, 8, 9, 10 ],
-               [ 8, 9, 10, 11, 12, 13,
-                  9, 10, 11, 12, 13, 14,
-                  10, 11, 12, 13, 14, 15,
-                  11, 12, 13, 14, 15, 16,
-                  12, 13, 14, 15, 16, 17 ]
-            }
+        (0,0) {
+            [ 0, 1, 2, 3 ],
+            [ 1, 2, 3, 4, 5, 6,
+        %s       2, 3, 4, 5, 6, 7,
+        %s       3, 4, 5, 6, 7, 8,
+        %s       4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10 ]
+         },
+        (0,1) {
+            [ 1, 2, 3, 4 ],
+            [ 2, 3, 4, 5, 6, 7,
+        %s       3, 4, 5, 6, 7, 8,
+        %s       4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11 ]
+         },
+        (0,2) {
+            [ 2, 3, 4, 5 ],
+            [ 3, 4, 5, 6, 7, 8,
+        %s       4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12 ]
+         },
+        (0,3) {
+            [ 3, 4, 5, 6 ],
+            [ 4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13 ]
+         },
+        (0,4) {
+            [ 4, 5, 6, 7 ],
+            [ 5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14 ]
+         },
+        (0,5) {
+            [ 5, 6, 7, 8 ],
+            [ 6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14,
+        %s       10, 11, 12, 13, 14, 15 ]
+         },
+        (1,0) {
+            [ 1, 2, 3, 4 ],
+            [ 2, 3, 4, 5, 6, 7,
+        %s       3, 4, 5, 6, 7, 8,
+        %s       4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11 ]
+         },
+        (1,1) {
+            [ 2, 3, 4, 5 ],
+            [ 3, 4, 5, 6, 7, 8,
+        %s       4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12 ]
+         },
+        (1,2) {
+            [ 3, 4, 5, 6 ],
+            [ 4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13 ]
+         },
+        (1,3) {
+            [ 4, 5, 6, 7 ],
+            [ 5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14 ]
+         },
+        (1,4) {
+            [ 5, 6, 7, 8 ],
+            [ 6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14,
+        %s       10, 11, 12, 13, 14, 15 ]
+         },
+        (1,5) {
+            [ 6, 7, 8, 9 ],
+            [ 7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14,
+        %s       10, 11, 12, 13, 14, 15,
+        %s       11, 12, 13, 14, 15, 16 ]
+         },
+        (2,0) {
+            [ 2, 3, 4, 5 ],
+            [ 3, 4, 5, 6, 7, 8,
+        %s       4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12 ]
+         },
+        (2,1) {
+            [ 3, 4, 5, 6 ],
+            [ 4, 5, 6, 7, 8, 9,
+        %s       5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13 ]
+         },
+        (2,2) {
+            [ 4, 5, 6, 7 ],
+            [ 5, 6, 7, 8, 9, 10,
+        %s       6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14 ]
+         },
+        (2,3) {
+            [ 5, 6, 7, 8 ],
+            [ 6, 7, 8, 9, 10, 11,
+        %s       7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14,
+        %s       10, 11, 12, 13, 14, 15 ]
+         },
+        (2,4) {
+            [ 6, 7, 8, 9 ],
+            [ 7, 8, 9, 10, 11, 12,
+        %s       8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14,
+        %s       10, 11, 12, 13, 14, 15,
+        %s       11, 12, 13, 14, 15, 16 ]
+         },
+        (2,5) {
+            [ 7, 8, 9, 10 ],
+            [ 8, 9, 10, 11, 12, 13,
+        %s       9, 10, 11, 12, 13, 14,
+        %s       10, 11, 12, 13, 14, 15,
+        %s       11, 12, 13, 14, 15, 16,
+        %s       12, 13, 14, 15, 16, 17 ]
+         }
          }
       }
       DATASET "dset4" {
          DATATYPE  "/group1/type3"
          DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
          DATA {
-            {
-               0,
-               3
-            },
-            {
-               1,
-               4
-            },
-            {
-               2,
-               5
-            },
-            {
-               3,
-               6
-            },
-            {
-               4,
-               7
-            }
+        (0) {
+            0,
+            3
+         },
+        (1) {
+            1,
+            4
+         },
+        (2) {
+            2,
+            5
+         },
+        (3) {
+            3,
+            6
+         },
+        (4) {
+            4,
+            7
+         }
          }
       }
       DATATYPE "type3" H5T_COMPOUND {
@@ -255,26 +255,26 @@ GROUP "/" {
          DATATYPE  "/#6632"
          DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
          DATA {
-            {
-               0,
-               0
-            },
-            {
-               1,
-               0.1
-            },
-            {
-               2,
-               0.2
-            },
-            {
-               3,
-               0.3
-            },
-            {
-               4,
-               0.4
-            }
+        (0) {
+            0,
+            0
+         },
+        (1) {
+            1,
+            0.1
+         },
+        (2) {
+            2,
+            0.2
+         },
+        (3) {
+            3,
+            0.3
+         },
+        (4) {
+            4,
+            0.4
+         }
          }
       }
    }