Changeset 907 for branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service2.c

Timestamp:

May 4, 2019, 3:36:37 PM (5 years ago)

Author:

djay

Message:

Fix typo. Define StdErr? from FinalizeHPC1 service. make sure to call removeShmLock in case it has been created by the GetStatus? service.

File:

• branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service2.c (modified) (4 diffs)

branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service2.c

@@ -133 +133 @@
     if(unlink(fullpath)==0){
       // TODO store the filename_full in the deletedfiles
-      fprintf(stderr,"#### DeleteData #### %s %d %s has been successfully deleted\n",__FILE__,__LINE__,(strlen(filename)>0?filename:fullpath));
+      fprintf(stderr,"#### DeleteData #### %s %d %s has been successfully deleted\n",__FILE__,__LINE__,(filename!=NULL && strlen(filename)>0?filename:fullpath));
     }else{
       fprintf(stderr,"#### DeleteData #### unable to delete %s %s \n",fullpath,fetchErrno(errno));
@@ -155 +155 @@
     map* ioname=getMapFromMaps(inputs,"ioname","value");
     char tmp0[4];
-    sprintf(tmp0,"%c%c%c",filename->value[strlen(filename->value)-4],filename->value[strlen(filename->value)-3],filename->value[strlen(filename->value)-2]);
+    sprintf(tmp0,"%c%c%c",filename->value[strlen(filename->value)-3],filename->value[strlen(filename->value)-2],filename->value[strlen(filename->value)-1]);
     char *cfilename=NULL;
     if(strcasecmp(tmp0,"zca")==0){
@@ -208 +208 @@
         char tmp1[8];
         snprintf(tmp1,7,"%s",filename->value);
-        if(strcasecmp(tmp1,"output")==0 || strcasecmp(tmp1,"input_")==0){
-          trydeletedatafile(tmppath->value,filename->value);
+        if(strcasecmp(tmp1,"output")==0 || strstr(filename->value,".zca")!=NULL || strcasecmp(tmp1,"input_")==0){
+          tryDeleteDataFile(tmpPath->value,filename->value);
           char *tmp=zStrdup(filename->value);
           tmp[strlen(tmp)-strlen(strrchr(tmp,'.'))]=0;
@@ -254 +254 @@
           setMapInMaps(outputs,"Result","value",_ss("The output data has been correclty removed"));
         }else{
-          setMapInMaps(conf,"lenv","message",_ss("The file you try to delete is nor an input, nor and output."));
+          setMapInMaps(conf,"lenv","message",_ss("The file you try to delete is nor an input, nor an output."));
           unlockFile(conf,lck);
           return SERVICE_FAILED;