Changeset 967 for trunk/zoo-project/zoo-kernel/server_internal.c

Timestamp:

Dec 18, 2020, 2:13:22 PM (4 years ago)

Author:

djay

Message:

Add support for the two inputs / outputs syntaxes discussed in SWG in both the ZOO-Kernel and the HTML basic UI. Update documentation, add a section for the ZOO-API in Python language section. Rename variables in service.c to ease readabiliy.

File:

• trunk/zoo-project/zoo-kernel/server_internal.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/server_internal.c

@@ -377 +377 @@
   sprintf(rsize,"%lld",f_status.st_size);
   if(getMap(content,"storage")==NULL){
-    map* memUse=getMapFromMaps(m,"main","memory");
-    if(memUse==NULL || strncmp(memUse->value,"load",4)==0){
-      map* tmpMap1=getMap(content,"value");
-      if(tmpMap1==NULL){
-        addToMap(content,"value","");
-        tmpMap1=getMap(content,"value");
-      }
-      free(tmpMap1->value);
-      tmpMap1->value=(char*) malloc((f_status.st_size+1)*sizeof(char));
-      if(tmpMap1->value==NULL){
-        setMapInMaps(m,"lenv","message","Unable to allocate the memory required to read the produced file.");
-        return;
-      }
-      fread(&tmpMap1->value,1,f_status.st_size,file);
-      tmpMap1->value[f_status.st_size]=0;
-    }
+    map* tmpMap1=getMap(content,"value");
+    if(tmpMap1==NULL){
+      addToMap(content,"value","");
+      tmpMap1=getMap(content,"value");
+    }
+    free(tmpMap1->value);
+    tmpMap1->value=(char*) malloc((f_status.st_size+1)*sizeof(char));
+    if(tmpMap1->value==NULL){
+      setMapInMaps(m,"lenv","message","Unable to allocate the memory required to read the produced file.");
+      return;
+    }
+    fread(tmpMap1->value,1,f_status.st_size,file);
+    tmpMap1->value[f_status.st_size]=0;
   }
   fclose(file);
@@ -994 +991 @@
 void runGetStatus(maps* conf,char* pid,char* req){
   map* r_inputs = getMapFromMaps (conf, "main", "tmpPath");
-  map* e_type = getMapFromMaps (conf, "lenv", "executionType");
+  map* e_type = getMapFromMaps (conf, "main", "executionType");
   char *sid=getStatusId(conf,pid);
   if(sid==NULL){
@@ -1101 +1098 @@
 void runDismiss(maps* conf,char* pid){
   map* r_inputs = getMapFromMaps (conf, "main", "tmpPath");
-  map* e_type = getMapFromMaps (conf, "lenv", "executionType");
+  map* e_type = getMapFromMaps (conf, "main", "executionType");
   char *sid=getStatusId(conf,pid);
   if(sid==NULL){