Changeset 860 for branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Dec 12, 2017, 4:09:47 PM (6 years ago)

Author:

djay

Message:

Add status_code key to the lenv section to support returning a specific HTTP error code from the service code. Fix callback invocation to support inputs arrays at step 1 and 2. Fix issue with cpu usage. Fix issue with mapserver publication when an input is optional. Fix callback invocation at step 7 in case the service has failed on the HPC side.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (8 diffs)

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

@@ -2201 +2201 @@
       int hasValidCookie = -1;
       char *tcook = originalCookie = zStrdup (cgiCookie);
-      //fprintf(stderr,">>>>> %s %d %s\n",__FILE__,__LINE__,tcook );
-      char *tmp = NULL;
       map *testing = getMapFromMaps (m, "main", "cookiePrefix");
       parseCookie(&m,originalCookie);
-      if (testing == NULL)
+      map *sessId=getMapFromMaps(m,"cookies",(testing==NULL?"ID":testing->value));
+      if (sessId!=NULL)
         {
-          tmp = zStrdup ("ID=");
-        }
-      else
-        {
-          tmp =
-            (char *) malloc ((strlen (testing->value) + 2) * sizeof (char));
-          sprintf (tmp, "%s=", testing->value);
-        }
-      if (strstr (cgiCookie, ";") != NULL)
-        {
-          char *token, *saveptr;
-          token = strtok_r (tcook, ";", &saveptr);
-          while (token != NULL)
-            {
-              if (strcasestr (token, tmp) != NULL)
-                {
-                  if (tcook != NULL)
-                    free (tcook);
-                  tcook = zStrdup (token);
-                  hasValidCookie = 1;
-                }
-              token = strtok_r (NULL, ";", &saveptr);
-            }
-        }
-      else
-        {
-          if (strstr (cgiCookie, "=") != NULL
-              && strcasestr (cgiCookie, tmp) != NULL)
-            {
-              tcook = zStrdup (cgiCookie);
-              hasValidCookie = 1;
-            }
-          if (tmp != NULL)
-            {
-              free (tmp);
-            }
-        }
-      if (hasValidCookie > 0)
-        {
-          addToMap (_tmpMaps->content, "sessid", strstr (tcook, "=") + 1);
+          addToMap (_tmpMaps->content, "sessid", sessId->value);
           char session_file_path[1024];
           map *tmpPath = getMapFromMaps (m, "main", "sessPath");
@@ -2254 +2214 @@
           if (tmp1 != NULL)
             sprintf (session_file_path, "%s/sess_%s.cfg", tmpPath->value,
-                     strstr (tmp1, "=") + 1);
+                     sessId->value);
           else
             sprintf (session_file_path, "%s/sess_%s.cfg", tmpPath->value,
-                     strstr (cgiCookie, "=") + 1);
+                     sessId->value);
           free (tcook);
           maps *tmpSess = (maps *) malloc (MAPS_SIZE);
@@ -2351 +2311 @@
   if (status == NULLMAP)
     {
-      /*        hInternet = InternetOpen (
-#ifndef WIN32
-                                  (LPCTSTR)
-#endif
-                                  "ZooWPSClient\0",
-                                  INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);*/
       if(validateRequest(&m,s1,request_inputs, &request_input_real_format,&request_output_real_format,&hInternet)<0){
         freeService (&s1);
@@ -2378 +2332 @@
       close_sql(m,0);      
 #endif      
-
-      /*#ifdef RELY_ON_DB
-      //close_sql(m,1);
-      //end_sql();
-      #endif*/
     }
   else
@@ -2433 +2382 @@
           setMapInMaps (m, "lenv", "async","true");
           map* r_inputs1 = createMap("ServiceName", s1->name);
-
-          /*hInternet = InternetOpen (
-#ifndef WIN32
-                                    (LPCTSTR)
-#endif
-                                    "ZooWPSClient\0",
-                                    INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
-#ifndef WIN32
-          if (!CHECK_INET_HANDLE (hInternet))
-            fprintf (stderr, "WARNING : hInternet handle failed to initialize");
-            #endif*/
 
           // Create the filename for the result file (.res)
@@ -2558 +2496 @@
           invokeCallback(m,request_input_real_format,NULL,1,0);
           fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-          dumpMaps(request_output_real_format);
+          //dumpMaps(request_output_real_format);
           if(validateRequest(&m,s1,request_inputs, &request_input_real_format,&request_output_real_format,&hInternet)<0){
             freeService (&s1);
@@ -2600 +2538 @@
             return -1;
           }
-          dumpMaps(request_output_real_format);
-          fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-          invokeCallback(m,request_input_real_format,NULL,1,1);
-          fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
           if(getMapFromMaps(m,"lenv","mapError")!=NULL){
                 setMapInMaps(m,"lenv","message",_("Issue with geographic data"));
@@ -2634 +2568 @@
   fprintf (stderr, "RUN IN BACKGROUND MODE %s %d \n",__FILE__,__LINE__);
 #endif
-fflush(stdout);
-rewind(stdout);
+  fflush(stdout);
+  rewind(stdout);
+
   if (eres != -1)
     outputResponse (s1, request_input_real_format,