Changeset 5 for trunk

Timestamp:

Apr 20, 2010, 5:34:33 PM (15 years ago)

Author:

djay

Message:

Add some required configuration parameters (tmpPath and tmpUrl, the full path to store ExecuteResponse? and its relative path respectively) to make the storeExecuteResponse option working. Add a file to store error output coming from services. Unload shared library.

Location:

trunk/zoo-kernel

Files:

• main.cfg (modified) (2 diffs)
• zoo_service_loader.c (modified) (8 diffs)

trunk/zoo-kernel/main.cfg

@@ -2 +2 @@
 encoding = utf-8
 version = 1.0.0
-serverAddress = http://dev.geolabs.fr/services/wps/
+serverAddress = http://www.zoo-project.org/zoo/
 lang = fr-FR,en-CA
+tmpPath=/YourFullTmpPathHere/
+tmpUrl = ../TmpPathRelativeToServerAdress/
 
 [identification]
 title = The Zoo WPS Development Server
-abstract = Development version of ZooWPS. See http://devpark.geolabs.fr/prj
+abstract = Development version of ZooWPS. See http://www.zoo-project.org
 fees = None
 accessConstraints = none
@@ -13 +15 @@
 
 [provider]
-providerName=GeoLabs SARL
-providerSite=http://dev.geolabs.fr
+providerName=ZOO Project
+providerSite=http://www.zoo-project.org
 individualName=Gerald FENOY
-positionName=Developper
-role=Gérant
+positionName=Developer
+role=Dev
 adressDeliveryPoint=1280, avenue des Platanes
 addressCity=Lattes

trunk/zoo-kernel/zoo_service_loader.c

@@ -482 +482 @@
         tmp_output=tmp_output->next;
       }
-      //dumpMaps(request_output_real_format);
     }
 
@@ -601 +600 @@
   else {
     xmlInitParser();
-    //dumpMap(postRequest);
 #ifdef DEBUG
     fflush(stderr);
@@ -608 +606 @@
 #endif
     xmlDocPtr doc =
-      xmlParseMemory(postRequest->value,cgiContentLength);//strlen(postRequest->value));
+      xmlParseMemory(postRequest->value,cgiContentLength);
 #ifdef DEBUG
     fprintf(stderr,"AFTER\n");
@@ -1434 +1432 @@
           fflush(stderr);
 #endif
-          //return 1;
         }
 
-        //dlclose(so);
+        dlclose(so);
       } else {
         /**
@@ -1472 +1469 @@
             if(strcmp(mtoupper(r_inputs->value),"JS")==0){
               eres=zoo_js_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
-              //dumpMaps(request_output_real_format);
-              //exit(-1);
             }
             else
@@ -1524 +1519 @@
       freopen(tmp1 , "w+", stdout);
       fclose(stdin);
-      fclose(stderr);
+      r_inputs=getMapFromMaps(m,"main","tmpPath");
+      sprintf(tmp1,"%s",r_inputs->value);
+      r_inputs=getMap(s1->content,"ServiceProvider");
+      sprintf(tmp1,"%s/%s",strdup(tmp1),r_inputs->value);
+      sprintf(tmp1,"%s_%d_error.log",strdup(tmp1),cpid);
+      freopen(tmp1,"w+",stderr);
       /**
        * set status to SERVICE_STARTED and flush stdout to ensure full 
@@ -1638 +1638 @@
              */
             eres=execute(&m,&request_input_real_format,&request_output_real_format);
-            //dlclose(so);
+            dlclose(so);
           }
         } else {
-          //#ifdef DEBUG
           /**
-           * Should fallback to others languages.
-           * Maybe beter to keep this informations anywhere 
-           * (in the service metadata ?)
+           * Unable to load the requested C Library
            */
           char tmps2[1024];
@@ -1711 +1708 @@
 #endif
 
-  //dlclose(so);
   return 0;
 }