From 856f1e91206b290246ecf14f46c6dff33a3c3913 Mon Sep 17 00:00:00 2001
From: Pedro Vicente Nunes <pvn@hdfgroup.org>
Date: Wed, 11 Mar 2009 14:36:08 -0500
Subject: [svn-r16572] #1462 By selecting a compression type, a big endian byte
 order was being selected. When reading the compression parameter keyword, the
 compression type read flag was incorrectly set to read, removed this line of
 code in->configOptionVector[COMPRESS] = 1;

Modified one configuration file to have the COMPRESSION-TYPE GZIP
Keyword.


Entered a bug description fix of
- h5import: By selecting a compression type, a big endian byte order was being
            selected (PVN - 2009/11/3)


tested: linux
---
 release_docs/RELEASE.txt              | 2 ++
 tools/h5import/h5import.c             | 4 ++--
 tools/h5import/h5importtestutil.sh    | 2 +-
 tools/h5import/testfiles/textin8.conf | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 2970475..ed8deee 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -82,6 +82,8 @@ New Features
 
     Tools
     -----
+    - h5import: By selecting a compression type, a big endian byte order was being 
+            selected. PVN - 2009/3/11
     - h5repack: When user doesn't specify a chunk size, h5repack now defines a default 
             chunk size as the same size of the size of the hyperslab used to read the chunks. 
             The size of the hyperslabs are defined as the size of each dimension or a 
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 89d14f9..933754e 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -1437,7 +1437,7 @@ processConfigurationFile(char *infile, struct Input *in, FILE **strm)
         if (in->configOptionVector[COMPRESS] == 0)
           in->compressionType = 0;
 
-        in->configOptionVector[COMPRESS] = 1;
+       
       break;
 
       case 12: /* EXTERNAL-STORAGE */
@@ -1990,7 +1990,7 @@ getCompressionType(struct Input *in, FILE** strm)
     return (-1);
   }
 
-  in->outputByteOrder = kindex;
+  in->compressionType = kindex;
   return (0);
 
 }
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh
index cbe7ec6..0409b46 100755
--- a/tools/h5import/h5importtestutil.sh
+++ b/tools/h5import/h5importtestutil.sh
@@ -65,7 +65,7 @@ TOOLTEST $srcdir/testfiles/in32.txt -c $srcdir/testfiles/textin32.conf -o test1.
 TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
 TOOLTEST $srcdir/testfiles/in16.txt -c $srcdir/testfiles/textin16.conf -o test2.h5
 
-TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " 
+TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed " 
 TOOLTEST $srcdir/testfiles/in16.txt -c $srcdir/testfiles/textin8.conf  -o test3.h5
 
 TESTING "ASCII UI32 - rank 3 - Output BE" 
diff --git a/tools/h5import/testfiles/textin8.conf b/tools/h5import/testfiles/textin8.conf
index 4405338..7bb80f4 100755
--- a/tools/h5import/testfiles/textin8.conf
+++ b/tools/h5import/testfiles/textin8.conf
@@ -4,12 +4,12 @@ INPUT-SIZE	8
 OUTPUT-CLASS IN
 OUTPUT-SIZE 8
 OUTPUT-BYTE-ORDER LE
-OUTPUT-ARCHITECTURE STD
 RANK 3
 DIMENSION-SIZES 2 4 3
 CHUNKED-DIMENSION-SIZES 2 2 2
 MAXIMUM-DIMENSIONS -1 -1 -1
 COMPRESSION-PARAM 3
+COMPRESSION-TYPE GZIP
 
 
 
-- 
cgit v0.12