[svn-r1055] Purpose:

    Bug fix

Problem:
    The hdp dumper output files used in the h5toh4 converter test
    program have the result of the latest changes to the HDF4 library,
    but the converter was to maintain compatability with HDF4.1r2.

Solution:
    Regenerate the HDF4.1r2 version of the hdp dumper ouput files to
    be used for the h5toh4 converter test program.

Platform tested:
    Solaris2.5

8 files changed, 55 insertions, 40 deletions

diff --git a/tools/testfiles/tall.dmp b/tools/testfiles/tall.dmp
index 780d029..40ab6aa 100644
--- a/tools/testfiles/tall.dmp
+++ b/tools/testfiles/tall.dmp
@@ -441,7 +441,7 @@ File name: testfiles/tall.hdf
 
 Vdata: 0
    tag = 1962; reference = 3;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 10;
    name = attr1; class = Attr0.0;
@@ -453,7 +453,7 @@ Loc.     Data
 
 Vdata: 1
    tag = 1962; reference = 4;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 16;
    name = attr2; class = Attr0.0;
@@ -465,7 +465,7 @@ Loc.     Data
 
 Vdata: 2
    tag = 1962; reference = 18;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim0; class = DimVal0.1;
@@ -477,7 +477,7 @@ Loc.     Data
 
 Vdata: 3
    tag = 1962; reference = 20;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim1; class = DimVal0.1;
@@ -489,7 +489,7 @@ Loc.     Data
 
 Vdata: 4
    tag = 1962; reference = 22;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim2; class = DimVal0.1;
@@ -501,7 +501,7 @@ Loc.     Data
 
 Vdata: 5
    tag = 1962; reference = 24;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim3; class = DimVal0.1;
@@ -513,7 +513,7 @@ Loc.     Data
 
 Vdata: 6
    tag = 1962; reference = 26;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim4; class = DimVal0.1;
@@ -525,7 +525,7 @@ Loc.     Data
 
 Vdata: 7
    tag = 1962; reference = 28;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim5; class = DimVal0.1;
@@ -537,7 +537,7 @@ Loc.     Data
 
 Vdata: 8
    tag = 1962; reference = 30;
-   number of records = 27; interlace = FULL_INTERLACE (0);
+   number of records = 27; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 1;
    name = attr1; class = Attr0.0;
@@ -555,7 +555,7 @@ Loc.     Data
 
 Vdata: 9
    tag = 1962; reference = 31;
-   number of records = 27; interlace = FULL_INTERLACE (0);
+   number of records = 27; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 1;
    name = attr2; class = Attr0.0;
diff --git a/tools/testfiles/tattr.dmp b/tools/testfiles/tattr.dmp
index 63c2af6..f7fd364 100644
--- a/tools/testfiles/tattr.dmp
+++ b/tools/testfiles/tattr.dmp
@@ -5,7 +5,7 @@ Vgroup:0
      tag = 1965; reference = 2;
      name = /; class = HDF5;
      number of entries = 0;
-   number of attributes = 4 
+   number of attributes = 5 
     attr0: name=attr1 type=20 count=24 size=24
 	97 116 116 114 105 98 117 116 101 32 111 102 32 114 111 
 	111 116 32 103 114 111 117 112 0 
@@ -16,6 +16,9 @@ Vgroup:0
 	0.700000 0.800000 0.900000 
     attr3: name=attr4 type=24 count=1 size=4
 	100 
+    attr4: name=attr5 type=20 count=17 size=17
+	115 116 114 105 110 103 32 97 116 116 114 105 98 117 116 
+	101 0 
 Entries:-
      None.
 
@@ -29,7 +32,7 @@ File name: testfiles/tattr.hdf
 
 Vdata: 0
    tag = 1962; reference = 3;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 24;
    name = attr1; class = Attr0.0;
@@ -41,7 +44,7 @@ Loc.     Data
 
 Vdata: 1
    tag = 1962; reference = 4;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 40;
    name = attr2; class = Attr0.0;
@@ -53,7 +56,7 @@ Loc.     Data
 
 Vdata: 2
    tag = 1962; reference = 5;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 80;
    name = attr3; class = Attr0.0;
@@ -65,7 +68,7 @@ Loc.     Data
 
 Vdata: 3
    tag = 1962; reference = 6;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 4;
    name = attr4; class = Attr0.0;
@@ -75,4 +78,16 @@ Vdata: 3
 Loc.     Data
 0        100  ; 
 
+Vdata: 4
+   tag = 1962; reference = 7;
+   number of records = 1; interlace = 0;
+   fields = [VALUES];
+   record size (in bytes) = 17;
+   name = attr5; class = Attr0.0;
+   number of attributes = 0 
+- field index 0: [VALUES], type=20, order=17
+   number of attributes = 0 
+Loc.     Data
+0        115 116 114 105 110 103 32 97 116 116 114 105 98 117 116 101 0  ; 
+
 File name: testfiles/tattr.hdf 
diff --git a/tools/testfiles/tcompound.dmp b/tools/testfiles/tcompound.dmp
index ac7b7a1..c0da354 100644
--- a/tools/testfiles/tcompound.dmp
+++ b/tools/testfiles/tcompound.dmp
@@ -80,7 +80,7 @@ File name: testfiles/tcompound.hdf
 
 Vdata: 0
    tag = 1962; reference = 3;
-   number of records = 5; interlace = FULL_INTERLACE (0);
+   number of records = 5; interlace = 0;
    fields = [a_name, b_name, c_name];
    record size (in bytes) = 16;
    name = dset1; class = HDF5;
@@ -97,7 +97,7 @@ Loc.     Data
 
 Vdata: 1
    tag = 1962; reference = 5;
-   number of records = 5; interlace = FULL_INTERLACE (0);
+   number of records = 5; interlace = 0;
    fields = [int_name, float_name];
    record size (in bytes) = 8;
    name = dset2; class = HDF5;
@@ -112,7 +112,7 @@ Loc.     Data
 
 Vdata: 2
    tag = 1962; reference = 7;
-   number of records = 5; interlace = FULL_INTERLACE (0);
+   number of records = 5; interlace = 0;
    fields = [int, float];
    record size (in bytes) = 8;
    name = dset4; class = HDF5;
@@ -127,7 +127,7 @@ Loc.     Data
 
 Vdata: 3
    tag = 1962; reference = 11;
-   number of records = 5; interlace = FULL_INTERLACE (0);
+   number of records = 5; interlace = 0;
    fields = [int, float];
    record size (in bytes) = 8;
    name = dset5; class = HDF5;
diff --git a/tools/testfiles/tcompound2.dmp b/tools/testfiles/tcompound2.dmp
index a2da66d..2475226 100644
--- a/tools/testfiles/tcompound2.dmp
+++ b/tools/testfiles/tcompound2.dmp
@@ -80,7 +80,7 @@ File name: testfiles/tcompound2.hdf
 
 Vdata: 0
    tag = 1962; reference = 3;
-   number of records = 6; interlace = FULL_INTERLACE (0);
+   number of records = 6; interlace = 0;
    fields = [a_name, b_name, c_name];
    record size (in bytes) = 16;
    name = dset1; class = HDF5;
@@ -98,7 +98,7 @@ Loc.     Data
 
 Vdata: 1
    tag = 1962; reference = 5;
-   number of records = 6; interlace = FULL_INTERLACE (0);
+   number of records = 6; interlace = 0;
    fields = [int_name, float_name];
    record size (in bytes) = 8;
    name = dset2; class = HDF5;
@@ -114,7 +114,7 @@ Loc.     Data
 
 Vdata: 2
    tag = 1962; reference = 7;
-   number of records = 6; interlace = FULL_INTERLACE (0);
+   number of records = 6; interlace = 0;
    fields = [int, float];
    record size (in bytes) = 8;
    name = dset4; class = HDF5;
@@ -130,7 +130,7 @@ Loc.     Data
 
 Vdata: 3
    tag = 1962; reference = 11;
-   number of records = 6; interlace = FULL_INTERLACE (0);
+   number of records = 6; interlace = 0;
    fields = [int, float];
    record size (in bytes) = 8;
    name = dset5; class = HDF5;
diff --git a/tools/testfiles/tdset.dmp b/tools/testfiles/tdset.dmp
index e44ab89..2f99ad5 100644
--- a/tools/testfiles/tdset.dmp
+++ b/tools/testfiles/tdset.dmp
@@ -212,7 +212,7 @@ File name: testfiles/tdset.hdf
 
 Vdata: 0
    tag = 1962; reference = 7;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim0; class = DimVal0.1;
@@ -224,7 +224,7 @@ Loc.     Data
 
 Vdata: 1
    tag = 1962; reference = 9;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim1; class = DimVal0.1;
@@ -236,7 +236,7 @@ Loc.     Data
 
 Vdata: 2
    tag = 1962; reference = 11;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim2; class = DimVal0.1;
@@ -248,7 +248,7 @@ Loc.     Data
 
 Vdata: 3
    tag = 1962; reference = 13;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim3; class = DimVal0.1;
diff --git a/tools/testfiles/tdset2.dmp b/tools/testfiles/tdset2.dmp
index 733e3db..cf4a7a0 100644
--- a/tools/testfiles/tdset2.dmp
+++ b/tools/testfiles/tdset2.dmp
@@ -212,7 +212,7 @@ File name: testfiles/tdset2.hdf
 
 Vdata: 0
    tag = 1962; reference = 7;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim0; class = DimVal0.1;
@@ -224,7 +224,7 @@ Loc.     Data
 
 Vdata: 1
    tag = 1962; reference = 9;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim1; class = DimVal0.1;
@@ -236,7 +236,7 @@ Loc.     Data
 
 Vdata: 2
    tag = 1962; reference = 11;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim2; class = DimVal0.1;
@@ -248,7 +248,7 @@ Loc.     Data
 
 Vdata: 3
    tag = 1962; reference = 13;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim3; class = DimVal0.1;
diff --git a/tools/testfiles/thlink.dmp b/tools/testfiles/thlink.dmp
index 3911724..8f0f34f 100644
--- a/tools/testfiles/thlink.dmp
+++ b/tools/testfiles/thlink.dmp
@@ -132,7 +132,7 @@ File name: testfiles/thlink.hdf
 
 Vdata: 0
    tag = 1962; reference = 7;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim0; class = DimVal0.1;
diff --git a/tools/testfiles/tmany.dmp b/tools/testfiles/tmany.dmp
index 2203d30..b9ba9cd 100644
--- a/tools/testfiles/tmany.dmp
+++ b/tools/testfiles/tmany.dmp
@@ -363,7 +363,7 @@ File name: testfiles/tmany.hdf
 
 Vdata: 0
    tag = 1962; reference = 5;
-   number of records = 6; interlace = FULL_INTERLACE (0);
+   number of records = 6; interlace = 0;
    fields = [a_array, b_array, c_array];
    record size (in bytes) = 320;
    name = dset1; class = HDF5;
@@ -392,7 +392,7 @@ Loc.     Data
 
 Vdata: 1
    tag = 1962; reference = 6;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 10;
    name = attr1; class = Attr0.0;
@@ -404,7 +404,7 @@ Loc.     Data
 
 Vdata: 2
    tag = 1962; reference = 7;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 16;
    name = attr2; class = Attr0.0;
@@ -416,7 +416,7 @@ Loc.     Data
 
 Vdata: 3
    tag = 1962; reference = 8;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [VALUES];
    record size (in bytes) = 80;
    name = attr3; class = Attr0.0;
@@ -428,7 +428,7 @@ Loc.     Data
 
 Vdata: 4
    tag = 1962; reference = 19;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim0; class = DimVal0.1;
@@ -440,7 +440,7 @@ Loc.     Data
 
 Vdata: 5
    tag = 1962; reference = 21;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim1; class = DimVal0.1;
@@ -452,7 +452,7 @@ Loc.     Data
 
 Vdata: 6
    tag = 1962; reference = 23;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim2; class = DimVal0.1;
@@ -464,7 +464,7 @@ Loc.     Data
 
 Vdata: 7
    tag = 1962; reference = 25;
-   number of records = 1; interlace = FULL_INTERLACE (0);
+   number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
    name = fakeDim3; class = DimVal0.1;