[svn-r8882] Purpose:

bug fix, new feature

Description:
fixed  bug in the parse function:
  cases where we have an already inserted name but there is a new name also
  example:
  -f dset1:GZIP=1 -l dset1,dset2:CHUNK=20x20
  dset1 is already inserted, but dset2 must also be (it was not)

added a CHECK_SZIP symbol to enable/disable checking of library related szip parameters
added the print of the filter name in verbose mode (confirms visually that the filter was applied )


Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

1 files changed, 12 insertions, 2 deletions

diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 56ab189..61ef4a7 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -42,7 +42,7 @@ static void aux_objinsert_filter(pack_info_t *obj,
  *
  * Return: 0 not found, 1 found
  *
- * Programmer:  pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
  *
  * Date: December 19, 2003
  *
@@ -104,7 +104,7 @@ int filter_this(const char* name,    /* object name from traverse list */
  *
  * Return: 0 success, -1 an error occured
  *
- * Programmer:  pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
  *
  * Date: December 19, 2003
  *
@@ -206,6 +206,8 @@ int apply_filters(const char* name,    /* object name from traverse list */
  */
   case H5Z_FILTER_SZIP:
    szip_pixels_per_block=obj->filter[i].cd_values[0];
+
+#if defined (CHECK_SZIP)
    /* check szip parameters */
    if (check_szip(type_id,
     obj->chunk.rank,
@@ -214,17 +216,24 @@ int apply_filters(const char* name,    /* object name from traverse list */
     &szip_pixels_per_block,
     options)==1)
    {
+#endif
+
     /* set up for szip data */
     if(H5Pset_chunk(dcpl_id,obj->chunk.rank,obj->chunk.chunk_lengths)<0)
      return -1;
     if (H5Pset_szip(dcpl_id, szip_options_mask, szip_pixels_per_block)<0) 
      return -1;
+
+#if defined (CHECK_SZIP)
    }
    else
    {
     if (options->verbose)
      printf("Warning: SZIP filter cannot be applied to <%s>\n",name);
    }
+#endif
+
+
    break;
 
 /*-------------------------------------------------------------------------
@@ -260,6 +269,7 @@ out:
 }
 
 
+
 /*-------------------------------------------------------------------------
  * Function: print_filters
  *