Changeset 605 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Mar 9, 2015, 4:46:24 PM (9 years ago)

Author:

knut

Message:

Altered the path of stored response files from [tmpPath]/[serviceProvider]_[cpid].xml to [tmpPath]/[serviceName]_[cpid].xml. Added support for a new parameter, libPath, in the [main] block of main.cfg. The libPath parameter is interpreted as the absolute path of the directory containing library files. If the libPath parameter is set, it will override the metapath parameter such that library files are loaded from [libPath]/[serviceProvider] instead of [CWD]/[metapath]/[serviceProvider]. Added the option to disable the metapath parameter (for security reasons) at compile time: If the Zoo kernel is compiled with the preprocessor directive IGNORE_METAPATH, the metapath will be set to the empty string. Note however, that the libPath and IGNORE_METAPATH options so far only work for C and PHP; the functions for loading libraries written in other languages should be modified correspondingly before the documentation is updated. See also ticket no. 112 (http://www.zoo-project.org/trac/ticket/112). Fixed some spelling errors and modified the language in some of the messages returned by the Zoo kernel.

File:

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

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

@@ -1943 +1943 @@
   case SERVICE_SUCCEEDED:
     nc1 = xmlNewNode(ns, BAD_CAST "ProcessSucceeded");
-    sprintf(sMsg,_("Service \"%s\" run successfully."),serv->name);
+    sprintf(sMsg,_("The service \"%s\" ran successfully."),serv->name);
     nc3=xmlNewText(BAD_CAST sMsg);
     xmlAddChild(nc1,nc3);
@@ -1951 +1951 @@
     tmpStatus=getMapFromMaps(m,"lenv","status");
     xmlNewProp(nc1,BAD_CAST "percentCompleted",BAD_CAST tmpStatus->value);
-    sprintf(sMsg,_("ZOO Service \"%s\" is currently running. Please, reload this document to get the up-to-date status of the Service."),serv->name);
+    sprintf(sMsg,_("The ZOO service \"%s\" is currently running. Please reload this document to get the up-to-date status of the service."),serv->name);
     nc3=xmlNewText(BAD_CAST sMsg);
     xmlAddChild(nc1,nc3);
@@ -1957 +1957 @@
   case SERVICE_ACCEPTED:
     nc1 = xmlNewNode(ns, BAD_CAST "ProcessAccepted");
-    sprintf(sMsg,_("Service \"%s\" was accepted by the ZOO Kernel and it run as a background task. Please consult the statusLocation attribtue providen in this document to get the up-to-date document."),serv->name);
+    sprintf(sMsg,_("The service \"%s\" was accepted by the ZOO kernel and is running as a background task. Please access the URL in the statusLocation attribute provided in this document to get the up-to-date status and results."),serv->name);
     nc3=xmlNewText(BAD_CAST sMsg);
     xmlAddChild(nc1,nc3);
@@ -2067 +2067 @@
         /* If the file cannot be created return an ExceptionReport */
         char tmpMsg[1024];
-        sprintf(tmpMsg,_("Unable to create the file : \"%s\" for storing the ExecuteResponse."),stored_path);
+        sprintf(tmpMsg,_("Unable to create the file \"%s\" for storing the ExecuteResponse."),stored_path);
 
         errorException(m,tmpMsg,"InternalError",NULL);
@@ -2251 +2251 @@
             nc3=xmlNewNode(ns_wps, BAD_CAST tmpV->value);
       else
-            nc3=xmlNewNode(ns_wps, BAD_CAST "LitteralData");
+            nc3=xmlNewNode(ns_wps, BAD_CAST "LiteralData");
     } 
     tmp=m->content;
@@ -2711 +2711 @@
     if(teste==NULL){
       char tmpMsg[1024];
-      sprintf(tmpMsg,_("Unable to create the file : \"%s\" for storing the session maps."),session_file_path);
+      sprintf(tmpMsg,_("Unable to create the file \"%s\" for storing the session maps."),session_file_path);
       errorException(m,tmpMsg,"InternalError",NULL);
 
@@ -2804 +2804 @@
             file_path=(char*)malloc((strlen(tmp1->value)+strlen(file_name)+2)*sizeof(char));
             sprintf(file_path,"%s/%s",tmp1->value,file_name);
-            
+    
                 FILE *ofile=fopen(file_path,"wb");
             if(ofile==NULL){
               char tmpMsg[1024];
-              sprintf(tmpMsg,_("Unable to create the file : \"%s\" for storing the %s final result."),file_name,tmpI->name);
+              sprintf(tmpMsg,_("Unable to create the file \"%s\" for storing the %s final result."),file_name,tmpI->name);
               errorException(m,tmpMsg,"InternalError",NULL);
               free(file_name);
@@ -2862 +2862 @@
 #endif
     printProcessResponse(m,request_inputs1,cpid,
-                         s,r_inputs->value,res,
+                //       s,r_inputs->value,res,
+                         s, s->name,res,  // replace serviceProvider with serviceName in stored response file name
                          request_inputs,
                          request_outputs);
@@ -2893 +2894 @@
       if(toto==NULL){
         char tmpMsg[1024];
-        sprintf(tmpMsg,_("Wrong RawDataOutput parameter, unable to fetch any result for the name your provided : \"%s\"."),tmpI->name);
+        sprintf(tmpMsg,_("Wrong RawDataOutput parameter: unable to fetch any result for the given parameter name: \"%s\"."),tmpI->name);
         errorException(m,tmpMsg,"InvalidParameterValue","RawDataOutput");
         return;
@@ -3832 +3833 @@
     free(tmp0);
     buffer[strlen(buffer)-1]=0;
-    if(i+1<level){
-      map* tmpMap=getMapFromMaps(conf,"lenv","metapath");
+    if(i+1<level){ 
+      #ifdef IGNORE_METAPATH
+        map* tmpMap = createMap("metapath", "");
+      #else  
+        map* tmpMap=getMapFromMaps(conf,"lenv","metapath");
+      #endif      
       if(tmpMap==NULL || strlen(tmpMap->value)==0){
         char *tmp01=zStrdup(tmp00->value);
@@ -3982 +3987 @@
     }
     if(hasValidValue<0){
-      char *replace=_("Ununderstood <%s> value, %s %s the only acceptable value.");
+      char *replace=_("The value <%s> was not recognized, %s %s the only acceptable value.");
       nb=0;
       char *vvalues=NULL;