Changeset 854 for branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c

Timestamp:

Nov 21, 2017, 10:24:14 AM (6 years ago)

Author:

djay

Message:

HPC support update. Add inputs for create options in Gdal_Dem.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c (modified) (6 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c

@@ -26 +26 @@
 #include "service_internal.h"
 #include "response_print.h"
+#include "service_callback.h"
 #include "mimetypes.h"
 #ifndef WIN32
@@ -444 +445 @@
           if(cSize!=NULL){
             length=atoi(cSize->value);
-          }
+          }else
+            length=strlen(cValue->value);
           writeFile(val,cValue->value,length);
           setMapArray(cMap,"cache_file",k,val);
@@ -466 +468 @@
         free(val);
       }
+      addToMap(inputs->content,"byValue","true");
     }
     inputs=inputs->next;
@@ -980 +983 @@
     if(isRunning(conf,pid)>0){
       if(strncasecmp(req,"GetResult",strlen(req))==0){
-        errorException (conf, _("The result for the requested JobID has not yet been generated. (1)"),
+        errorException (conf, _("The result for the requested JobID has not yet been generated. The service is currently running."),
                         "ResultNotReady", pid);
         return;
@@ -1008 +1011 @@
           printf("%s",result);
           fflush(stdout);
+          free(sid);
           freeMap(&statusInfo);
           free(statusInfo);
+          free(result);
           return;
         }else{
-          errorException (conf, _("The result for the requested JobID has not yet been generated. (2)"),
+          errorException (conf, _("The result for the requested JobID has not yet been generated. The service ends but it still needs to produce the outputs."),
                           "ResultNotReady", pid);
           freeMap(&statusInfo);
@@ -1104 +1109 @@
     removeService(conf,pid);
 #endif
+    /*
+      fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+      invokeCallback(conf,NULL,NULL,7,1);
+      fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+    */
     map* statusInfo=createMap("JobID",pid);
     addToMap(statusInfo,"Status","Dismissed");