[svn-r13134]

New version of the function h5tools_dump_simple_subset, to display subsetting. The new algorithm is: 
Introduced an outer loop for cases where dimensionality is greater 
 than 2D. In each iteration a 2D block is displayed by rows in a inner
 loop. The remainning slower dimensions above the first 2 are incremented 
 one at a time in the outer loop

Note: when blocks are introduced, the display is not correct. This is a bug that requires an improvement of the algorithm.

7 files changed, 71 insertions, 84 deletions

diff --git a/tools/testfiles/tall-4s.ddl b/tools/testfiles/tall-4s.ddl
index eba555b..a8acdfa 100644
--- a/tools/testfiles/tall-4s.ddl
+++ b/tools/testfiles/tall-4s.ddl
@@ -11,8 +11,9 @@ DATASET "/g1/g1.1/dset1.1.1" {
       COUNT ( 3, 2 );
       BLOCK ( 1, 1 );
       DATA {
-      (1,1): 1, 3, 5,
-      (1,4):  4, 12, 20
+      (1,1): 1, 4,
+      (3,1):  3, 12,
+      (5,1):  5, 20
       }
    }
    ATTRIBUTE "attr1" {
diff --git a/tools/testfiles/tall-5s.ddl b/tools/testfiles/tall-5s.ddl
index fbf5238..95e4d63 100644
--- a/tools/testfiles/tall-5s.ddl
+++ b/tools/testfiles/tall-5s.ddl
@@ -11,16 +11,7 @@ DATASET "/g1/g1.1/dset1.1.2" {
       COUNT ( 10 );
       BLOCK ( 1 );
       DATA {
-      (0): 0,
-      (2):  2,
-      (4):  4,
-      (6):  6,
-      (8):  8,
-      (10):  10,
-      (12):  12,
-      (14):  14,
-      (16):  16,
-      (18):  18
+      (0): 0, 2, 4, 6, 8, 10, 12, 14, 16, 18
       }
    }
 }
diff --git a/tools/testfiles/tdset-3s.ddl b/tools/testfiles/tdset-3s.ddl
index ae9f5f2..d8deced 100644
--- a/tools/testfiles/tdset-3s.ddl
+++ b/tools/testfiles/tdset-3s.ddl
@@ -11,25 +11,24 @@ DATASET "/dset1" {
       COUNT ( 9, 19 );
       BLOCK ( 1, 1 );
       DATA {
-      (1,1): 2, 3, 4, 5, 6, 7, 8, 9, 10,
-      (1,2):  3, 4, 5, 6, 7, 8, 9, 10, 11,
-      (1,3):  4, 5, 6, 7, 8, 9, 10, 11, 12,
-      (1,4):  5, 6, 7, 8, 9, 10, 11, 12, 13,
-      (1,5):  6, 7, 8, 9, 10, 11, 12, 13, 14,
-      (1,6):  7, 8, 9, 10, 11, 12, 13, 14, 15,
-      (1,7):  8, 9, 10, 11, 12, 13, 14, 15, 16,
-      (1,8):  9, 10, 11, 12, 13, 14, 15, 16, 17,
-      (1,9):  10, 11, 12, 13, 14, 15, 16, 17, 18,
-      (1,10):  11, 12, 13, 14, 15, 16, 17, 18, 19,
-      (1,11):  12, 13, 14, 15, 16, 17, 18, 19, 20,
-      (1,12):  13, 14, 15, 16, 17, 18, 19, 20, 21,
-      (1,13):  14, 15, 16, 17, 18, 19, 20, 21, 22,
-      (1,14):  15, 16, 17, 18, 19, 20, 21, 22, 23,
-      (1,15):  16, 17, 18, 19, 20, 21, 22, 23, 24,
-      (1,16):  17, 18, 19, 20, 21, 22, 23, 24, 25,
-      (1,17):  18, 19, 20, 21, 22, 23, 24, 25, 26,
-      (1,18):  19, 20, 21, 22, 23, 24, 25, 26, 27,
-      (1,19):  20, 21, 22, 23, 24, 25, 26, 27, 28
+      (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
       }
    }
 }
diff --git a/tools/testfiles/tindicessub1.ddl b/tools/testfiles/tindicessub1.ddl
index ea3114f..6195a78 100644
--- a/tools/testfiles/tindicessub1.ddl
+++ b/tools/testfiles/tindicessub1.ddl
@@ -11,46 +11,9 @@ DATASET "1d" {
       COUNT ( 40 );
       BLOCK ( 1 );
       DATA {
-      (3): 3,
-      (4):  4,
-      (5):  5,
-      (6):  6,
-      (7):  7,
-      (8):  8,
-      (9):  9,
-      (10):  10,
-      (11):  11,
-      (12):  12,
-      (13):  13,
-      (14):  14,
-      (15):  15,
-      (16):  16,
-      (17):  17,
-      (18):  18,
-      (19):  19,
-      (20):  20,
-      (21):  21,
-      (22):  22,
-      (23):  23,
-      (24):  24,
-      (25):  25,
-      (26):  26,
-      (27):  27,
-      (28):  28,
-      (29):  29,
-      (30):  30,
-      (31):  31,
-      (32):  32,
-      (33):  33,
-      (34):  34,
-      (35):  35,
-      (36):  36,
-      (37):  37,
-      (38):  38,
-      (39):  39,
-      (40):  40,
-      (41):  41,
-      (42):  42
+      (3): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+      (21): 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+      (37): 37, 38, 39, 40, 41, 42
       }
    }
 }
diff --git a/tools/testfiles/tindicessub2.ddl b/tools/testfiles/tindicessub2.ddl
index 19ae962..9fc987c 100644
--- a/tools/testfiles/tindicessub2.ddl
+++ b/tools/testfiles/tindicessub2.ddl
@@ -11,10 +11,12 @@ DATASET "2d" {
       COUNT ( 6, 4 );
       BLOCK ( 1, 1 );
       DATA {
-      (1,3): 13, 23, 33, 43, 53, 63,
-      (1,4):  14, 24, 34, 44, 54, 64,
-      (1,5):  15, 25, 35, 45, 55, 65,
-      (1,6):  16, 26, 36, 46, 56, 66
+      (1,3): 13, 14, 15, 16,
+      (2,3):  23, 24, 25, 26,
+      (3,3):  33, 34, 35, 36,
+      (4,3):  43, 44, 45, 46,
+      (5,3):  53, 54, 55, 56,
+      (6,3):  63, 64, 65, 66
       }
    }
 }
diff --git a/tools/testfiles/tindicessub3.ddl b/tools/testfiles/tindicessub3.ddl
index 76be13f..ba86242 100644
--- a/tools/testfiles/tindicessub3.ddl
+++ b/tools/testfiles/tindicessub3.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -d 3d -s 0,1,3 -c 1,6,4 taindices.h5'
+Expected output for 'h5dump -d 3d -s 0,1,3 -c 2,6,4 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "3d" {
@@ -8,13 +8,21 @@ DATASET "3d" {
    SUBSET {
       START ( 0, 1, 3 );
       STRIDE ( 1, 1, 1 );
-      COUNT ( 1, 6, 4 );
+      COUNT ( 2, 6, 4 );
       BLOCK ( 1, 1, 1 );
       DATA {
-      (0,1,3): 13, 23, 33, 43, 53, 63,
-      (0,1,4):  14, 24, 34, 44, 54, 64,
-      (0,1,5):  15, 25, 35, 45, 55, 65,
-      (0,1,6):  16, 26, 36, 46, 56, 66
+      (0,1,3): 13, 14, 15, 16,
+      (0,2,3):  23, 24, 25, 26,
+      (0,3,3):  33, 34, 35, 36,
+      (0,4,3):  43, 44, 45, 46,
+      (0,5,3):  53, 54, 55, 56,
+      (0,6,3):  63, 64, 65, 66
+      (1,1,3):  113, 114, 115, 116,
+      (1,2,3):  123, 124, 125, 126,
+      (1,3,3):  133, 134, 135, 136,
+      (1,4,3):  143, 144, 145, 146,
+      (1,5,3):  153, 154, 155, 156,
+      (1,6,3):  163, 164, 165, 166
       }
    }
 }
diff --git a/tools/testfiles/tindicessub4.ddl b/tools/testfiles/tindicessub4.ddl
index cad9c06..99fca01 100644
--- a/tools/testfiles/tindicessub4.ddl
+++ b/tools/testfiles/tindicessub4.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -d 4d -s 0,0,1,3 -c 1,1,1,1 taindices.h5'
+Expected output for 'h5dump -d 4d -s 0,0,1,3 -c 2,2,6,4 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "4d" {
@@ -8,10 +8,33 @@ DATASET "4d" {
    SUBSET {
       START ( 0, 0, 1, 3 );
       STRIDE ( 1, 1, 1, 1 );
-      COUNT ( 1, 1, 1, 1 );
+      COUNT ( 2, 2, 6, 4 );
       BLOCK ( 1, 1, 1, 1 );
       DATA {
-      (0,0,1,3): 13
+      (0,0,1,3): 13, 14, 15, 16,
+      (0,0,2,3):  23, 24, 25, 26,
+      (0,0,3,3):  33, 34, 35, 36,
+      (0,0,4,3):  43, 44, 45, 46,
+      (0,0,5,3):  53, 54, 55, 56,
+      (0,0,6,3):  63, 64, 65, 66
+      (0,1,1,3):  113, 114, 115, 116,
+      (0,1,2,3):  123, 124, 125, 126,
+      (0,1,3,3):  133, 134, 135, 136,
+      (0,1,4,3):  143, 144, 145, 146,
+      (0,1,5,3):  153, 154, 155, 156,
+      (0,1,6,3):  163, 164, 165, 166
+      (1,0,1,3):  213, 214, 215, 216,
+      (1,0,2,3):  223, 224, 225, 226,
+      (1,0,3,3):  233, 234, 235, 236,
+      (1,0,4,3):  243, 244, 245, 246,
+      (1,0,5,3):  253, 254, 255, 256,
+      (1,0,6,3):  263, 264, 265, 266
+      (1,1,1,3):  313, 314, 315, 316,
+      (1,1,2,3):  323, 324, 325, 326,
+      (1,1,3,3):  333, 334, 335, 336,
+      (1,1,4,3):  343, 344, 345, 346,
+      (1,1,5,3):  353, 354, 355, 356,
+      (1,1,6,3):  363, 364, 365, 366
       }
    }
 }