[svn-r4710]

Purpose:
    bug fix
Description:
 HDF4 vdata is extensible, So the converted HDF5 should be extensible.
 The old version doesnot make the converted HDF5 dataset extensible.
Solution:
Make it extensible.
Platforms tested:
redHat 6.2(eirene)

1 files changed, 26 insertions, 9 deletions

diff --git a/tools/h4toh5/h4toh5vdata.c b/tools/h4toh5/h4toh5vdata.c
index e4efd1d..d1cd389 100644
--- a/tools/h4toh5/h4toh5vdata.c
+++ b/tools/h4toh5/h4toh5vdata.c
@@ -85,6 +85,7 @@ int Vdata_h4_to_h5(int32 file_id,int32 vdata_id, hid_t group_id,int h4_attr) {
 
   hid_t     h5_ctype;
   hid_t     h5_cmemtype;
+  hid_t     create_plist;
 
   hid_t*     h5memtype = NULL;
   hid_t*     h5type = NULL;
@@ -92,6 +93,8 @@ int Vdata_h4_to_h5(int32 file_id,int32 vdata_id, hid_t group_id,int h4_attr) {
   size_t*    h4memsize = NULL;
   size_t*    h4size = NULL;
   hsize_t   h5_vddims[1];
+  hsize_t   h5_maxvddims[1];
+  hsize_t   h5_chunkdims[1];
   char*     h5cvdata_name;
 
   int       check_vdname;
@@ -230,7 +233,6 @@ int Vdata_h4_to_h5(int32 file_id,int32 vdata_id, hid_t group_id,int h4_attr) {
   for (i=0;i<nfields;i++) {
     /* obtain field order.*/
      fieldorder = VFfieldorder(vdata_id,i);  
-
      if(fieldorder == FAIL){
        printf("error in obtaining field order. \n");
        free(h5memtype);
@@ -256,9 +258,10 @@ int Vdata_h4_to_h5(int32 file_id,int32 vdata_id, hid_t group_id,int h4_attr) {
     return FAIL;
   }
 
-  h5_vddims[0] = n_records;
-  h5d_sid = H5Screate_simple(1,h5_vddims,NULL);
+  h5_vddims[0]    = n_records;
+  h5_maxvddims[0] = H5S_UNLIMITED;
 
+  h5d_sid = H5Screate_simple(1,h5_vddims,h5_maxvddims);
   if(h5d_sid <0){
     printf("error in obtaining space id.\n");
     free(h5memtype);
@@ -290,7 +293,21 @@ int Vdata_h4_to_h5(int32 file_id,int32 vdata_id, hid_t group_id,int h4_attr) {
     return FAIL;
   }
 
-  h5dset = H5Dcreate(group_id,h5cvdata_name,h5_ctype,h5d_sid,H5P_DEFAULT);
+  h5_chunkdims[0] = h5_vddims[0];
+  create_plist = H5Pcreate(H5P_DATASET_CREATE);
+  if (H5Pset_chunk(create_plist,1,h5_chunkdims)<0){
+     printf("failed to set up chunking information for ");
+     printf("property list.\n");
+     free(h5memtype);
+     free(h5type);
+     free(h4memsize);
+     free(h4size);
+     free(vd_data);       
+     free(h5cvdata_name);
+     H5Pclose(create_plist);
+     return FAIL;	
+  }
+  h5dset = H5Dcreate(group_id,h5cvdata_name,h5_ctype,h5d_sid,create_plist);
   if(h5dset <0) {
     printf("error in obtaining dataset.\n");
     free(h5memtype);
@@ -420,7 +437,7 @@ int Vdata_h4_to_h5(int32 file_id,int32 vdata_id, hid_t group_id,int h4_attr) {
     }
   }
   
-  if(h4_transnumattr(h5dset,HDF4_REF_NUM,vdata_ref)==FAIL){
+  if(h4_transnumattr(h5dset,HDF4_REF_NUM,(uint16)vdata_ref)==FAIL){
     printf("error in transfering vdata attributes.\n");
     free(h5memtype);
     free(h5type);
@@ -527,7 +544,7 @@ int  vdata_transattrs(int32 vdata_id,hid_t h5dset,int snum_vdattrs,
 
        strcat(svdattr_name,":");
        strcat(svdattr_name,"HDF4_VDATA_ATTR_");
-       if(conv_int_str(field_index,refstr)==FAIL) {
+       if(conv_int_str((uint16)field_index,refstr)==FAIL) {
 	 printf("error in converting vdata field index to string.\n");
 	 return FAIL;
        }
@@ -570,7 +587,7 @@ int  vdata_transattrs(int32 vdata_id,hid_t h5dset,int snum_vdattrs,
          return FAIL;
       }
 
-      if ((sh5str_memtype = mkstr(count_svdadata*sh4_amemsize,
+      if ((sh5str_memtype = mkstr((int)(count_svdadata*sh4_amemsize),
 				    H5T_STR_SPACEPAD))<0) {
 	  printf("error in making memory string for vdata attribute. \n");
 	  free(svd_adata);
@@ -731,7 +748,7 @@ int gen_h5comptype(int32 vdata_id,int32 nfields,
 
    if(sh5type[i] == H5T_STRING) {
 
-    if ((h5str_type = mkstr(sh4size[i]*fieldorder,H5T_STR_SPACEPAD))<0) {
+    if ((h5str_type = mkstr((int)(sh4size[i]*fieldorder),H5T_STR_SPACEPAD))<0) {
        printf("error in making string of hdf5 string. \n");
        return FAIL;
      }
@@ -741,7 +758,7 @@ int gen_h5comptype(int32 vdata_id,int32 nfields,
 
    if (sh5memtype[i] == H5T_STRING) {
 
-     if((h5str_type = mkstr(sh4memsize[i]*fieldorder,H5T_STR_SPACEPAD))<0){ 
+     if((h5str_type = mkstr((int)(sh4memsize[i]*fieldorder),H5T_STR_SPACEPAD))<0){ 
        printf("error in making string for VDATA in memory. \n");
        return FAIL;
      }