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

Timestamp:

Apr 13, 2015, 8:17:18 PM (9 years ago)

Author:

djay

Message:

Add readBase64 function, avoid calling it prior to fork . Add dumpMapsValuesToFiles function used to simplify OTB support.

File:

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

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

@@ -1968 +1968 @@
           if (lid < 0)
             {
-              fprintf (stderr, "ERROR %s %d\n", __FILE__, __LINE__);
-              fflush (stderr);
-              return -1;
+              return errorException (m, _("Lock failed"),
+                              "InternalError", NULL);
             }
           else
@@ -1976 +1975 @@
               if (lockShm (lid) < 0)
                 {
-                  fprintf (stderr, "ERROR %s %d\n", __FILE__, __LINE__);
-                  fflush (stderr);
-                  return -1;
+                  return errorException (m, _("Lock failed"),
+                                         "InternalError", NULL);
                 }
-              fflush (stderr);
             }
           f0 = freopen (fbkp, "w+", stdout);
@@ -1987 +1984 @@
           fclose (stdin);
 #endif
+
+          /**
+           * set status to SERVICE_STARTED and flush stdout to ensure full 
+           * content was outputed (the file used to store the ResponseDocument).
+           * The rewind stdout to restart writing from the bgining of the file,
+           * this way the data will be updated at the end of the process run.
+           */
+          printProcessResponse (m, request_inputs, cpid, s1, r_inputs1->value,
+                                SERVICE_STARTED, request_input_real_format,
+                                request_output_real_format);
+          fflush (stdout);
+          unlockShm (lid);
+          fflush (stderr);
+          fbkp1 =
+            (char *)
+            malloc ((strlen (r_inputs->value) + strlen (r_inputs1->value) +
+                     1024) * sizeof (char));
+          sprintf (fbkp1, "%s/%s_final_%d.xml", r_inputs->value,
+                   r_inputs1->value, cpid);
+
+          f1 = freopen (fbkp1, "w+", stdout);
           free (flog);
+
           if(validateRequest(&m,s1,request_inputs, &request_input_real_format,&request_output_real_format,&hInternet)<0){
             freeService (&s1);
@@ -2006 +2025 @@
             return -1;
           }
-      /**
-       * set status to SERVICE_STARTED and flush stdout to ensure full 
-       * content was outputed (the file used to store the ResponseDocument).
-       * The rewind stdout to restart writing from the bgining of the file,
-       * this way the data will be updated at the end of the process run.
-       */
-          printProcessResponse (m, request_inputs, cpid, s1, r_inputs1->value,
-                                SERVICE_STARTED, request_input_real_format,
-                                request_output_real_format);
-          fflush (stdout);
-          unlockShm (lid);
-          fflush (stderr);
-          fbkp1 =
-            (char *)
-            malloc ((strlen (r_inputs->value) + strlen (r_inputs1->value) +
-                     1024) * sizeof (char));
-          sprintf (fbkp1, "%s/%s_final_%d.xml", r_inputs->value,
-                   r_inputs1->value, cpid);
-          f1 = freopen (fbkp1, "w+", stdout);
           loadServiceAndRun (&m, s1, request_inputs,
                              &request_input_real_format,
                              &request_output_real_format, &eres);
+
         }
       else