Changeset 790 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Dec 19, 2016, 6:01:06 PM (7 years ago)

Author:

djay

Message:

Add support for nested inputs and outputs.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (11 diffs)

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

@@ -770 +770 @@
 
   map *tmpReq = getMap (request_inputs, "xrequest");
-  
+
   if(r_inputs2 != NULL && tmpReq != NULL) {
     const char key[] = "rfile=";
@@ -922 +922 @@
   if (m == NULL)
     {
-      return errorException (m, _("Unable to allocate memory"),
+      return errorException (NULL, _("Unable to allocate memory"),
                              "InternalError", NULL);
     }
+  m->child=NULL;
   char ntmp[1024];
 #ifndef ETC_DIR
@@ -1537 +1538 @@
                                                            NULL);
                                   }
-#ifdef DEBUG
-                                printf
-                                  ("#################\n(%s) %s\n#################\n",
+#ifdef DEBUG_SERVICE_CONF
+                                fprintf
+                                  (stderr,"#################\n(%s) %s\n#################\n",
                                    r_inputs->value, buff1);
 #endif
@@ -1703 +1704 @@
   map *postRequest = NULL;
   postRequest = getMap (request_inputs, "xrequest");
-
+  
   if(vid==1 && postRequest==NULL){
     errorException (m,_("Unable to run Execute request using the GET HTTP method"),"InvalidParameterValue", "request");  
@@ -1817 +1818 @@
   maps *tmpmaps = request_input_real_format;
 
-
   if(parseRequest(&m,&request_inputs,s1,&request_input_real_format,&request_output_real_format,&hInternet)<0){
     freeMaps (&m);
@@ -1828 +1828 @@
     return 0;
   }
-
 
   // Define each env variable in runing environment
@@ -1989 +1988 @@
    *
    */
-  maps *_tmpMaps = (maps *) malloc (MAPS_SIZE);
-  _tmpMaps->name = zStrdup ("lenv");
+  maps *_tmpMaps = createMaps("lenv");
   char tmpBuff[100];
   struct ztimeval tp;
@@ -1998 +1996 @@
     sprintf (tmpBuff, "%i", (cpid + (int) time (NULL)));
   _tmpMaps->content = createMap ("osid", tmpBuff);
-  _tmpMaps->next = NULL;
   sprintf (tmpBuff, "%i", cpid);
   addToMap (_tmpMaps->content, "sid", tmpBuff);
@@ -2081 +2078 @@
           free (tcook);
           maps *tmpSess = (maps *) malloc (MAPS_SIZE);
+          tmpSess->child=NULL;
           struct stat file_status;
           int istat = stat (session_file_path, &file_status);
@@ -2106 +2104 @@
     *environ;
 #endif
-  _tmpMaps = (maps *) malloc (MAPS_SIZE);
-  _tmpMaps->name = zStrdup ("renv");
-  _tmpMaps->content = NULL;
-  _tmpMaps->next = NULL;
+  _tmpMaps = createMaps("renv");
   for (; s; ei++) {
     char* tmpName=zStrdup(s);
@@ -2229 +2224 @@
                      strlen (usid->value) + 7) * sizeof (char));                    
           sprintf (fbkpres, "%s/%s.res", r_inputs->value, usid->value);
-          bmap = (maps *) malloc (MAPS_SIZE);
-          bmap->name=zStrdup("status");
+          bmap = createMaps("status");
           bmap->content=createMap("usid",usid->value);
-          bmap->next=NULL;
           addToMap(bmap->content,"sid",tmpm->value);
           addIntToMap(bmap->content,"pid",getpid());