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

Timestamp:

Feb 12, 2014, 3:25:15 PM (9 years ago)

Author:

djay

Message:

Add the optional Ruby Language Support to the ZOO-Kernel with an API similar to the Python ZOO-API. Small rewrite of Python support. Fix issue #86 and #87. Add usid in [lenv] section, this value is used to generate an unique identifier based on time and the process identifier. This usid is now used to name the stored result or the mapfile generated. Remove *some* warning messages displayed at compilation time.

File:

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

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

@@ -1212 +1212 @@
       map* tmpm2=getMap(tmp_maps->content,"tmpUrl");
       if(tmpm1!=NULL && tmpm2!=NULL){
-        if(strncasecmp(tmpm2->value,"http://",7)==0){
+        if( strncasecmp( tmpm2->value, "http://", 7) == 0 ||
+            strncasecmp( tmpm2->value, "https://", 8 ) == 0 ){
           sprintf(url,"%s/%s_%i.xml",tmpm2->value,service,pid);
         }else
@@ -1892 +1893 @@
       map * errormap = createMap("text",tmpMsg);
       addToMap(errormap,"code", "InternalError");
+      
       printExceptionReportResponse(m,errormap);
       freeMap(&errormap);
@@ -1903 +1905 @@
   }
   
+  if(res==SERVICE_FAILED){
+    map * errormap;
+    map *lenv;
+    lenv=getMapFromMaps(m,"lenv","message");
+    char *tmp0;
+    if(lenv!=NULL){
+      tmp0=(char*)malloc((strlen(lenv->value)+strlen(_("Unable to run the Service. The message returned back by the Service was the following: "+1)))*sizeof(char));
+      sprintf(tmp0,_("Unable to run the Service. The message returned back by the Service was the following: %s"),lenv->value);
+    }
+    else{
+      tmp0=(char*)malloc((strlen(_("Unable to run the Service. No more information was returned back by the Service."))+1)*sizeof(char));
+      sprintf(tmp0,_("Unable to run the Service. No more information was returned back by the Service."));
+    }
+    errormap = createMap("text",tmp0);
+    free(tmp0);
+    addToMap(errormap,"code", "InternalError");
+    printExceptionReportResponse(m,errormap);
+    freeMap(&errormap);
+    free(errormap);
+    return;
+  }
+
   if(asRaw==0){
 #ifdef DEBUG
@@ -1915 +1939 @@
       toto=getMap(tmpI->content,"asReference");
 #ifdef USE_MS
-      if(toto!=NULL && strcasecmp(toto->value,"true")==0 && testMap==NULL){
+      if(toto!=NULL && strcasecmp(toto->value,"true")==0 && testMap==NULL)
 #else
-      if(toto!=NULL && strcasecmp(toto->value,"true")==0){
-#endif
+      if(toto!=NULL && strcasecmp(toto->value,"true")==0)
+#endif
+        {
         elements* in=getElements(s->outputs,tmpI->name);
         char *format=NULL;
@@ -1933 +1958 @@
         map *ext=getMap(tmpI->content,"extension");
         map *tmp1=getMapFromMaps(m,"main","tmpPath");
-        char *file_name;
+        char *file_name,*file_path;
         bool hasExt=true;
         if(ext==NULL){
@@ -1957 +1982 @@
           hasExt=false;
         }
-        file_name=(char*)malloc((strlen(tmp1->value)+strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+13)*sizeof(char));
-        sprintf(file_name,"%s/%s_%s_%i.%s",tmp1->value,s->name,tmpI->name,cpid+100000,ext->value);
-        FILE *ofile=fopen(file_name,"wb");
+        file_name=(char*)malloc((strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+1024)*sizeof(char));
+        int cpid0=cpid+time(NULL);
+        sprintf(file_name,"%s_%s_%i.%s",s->name,tmpI->name,cpid0,ext->value);
+        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];
@@ -1968 +1996 @@
           freeMap(&errormap);
           free(errormap);
+          free(file_name);
+          free(file_path);
           return;
         }
+        free(file_path);
         map *tmp2=getMapFromMaps(m,"main","tmpUrl");
         map *tmp3=getMapFromMaps(m,"main","serverAddress");
         char *file_url;
         if(strncasecmp(tmp2->value,"http://",7)==0){
-          file_url=(char*)malloc((strlen(tmp2->value)+strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+13)*sizeof(char));
-          sprintf(file_url,"%s/%s_%s_%i.%s",tmp2->value,s->name,tmpI->name,cpid+100000,ext->value);
+          file_url=(char*)malloc((strlen(tmp2->value)+strlen(file_name))*sizeof(char));
+          sprintf(file_url,"%s/%s",tmp2->value,file_name);
         }else{
-          file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+13)*sizeof(char));
-          sprintf(file_url,"%s/%s/%s_%s_%i.%s",tmp3->value,tmp2->value,s->name,tmpI->name,cpid+100000,ext->value);
+          file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(file_name))*sizeof(char));
+          sprintf(file_url,"%s/%s/%s",tmp3->value,tmp2->value,file_name);
         }
         addToMap(tmpI->content,"Reference",file_url);
@@ -2019 +2050 @@
                          request_inputs,
                          request_outputs);
-  }
-  else
-    if(res!=SERVICE_FAILED){
+    }
+    else{
       /**
        * We get the requested output or fallback to the first one if the 
@@ -2083 +2113 @@
 #endif
       }
-    }else{
-      char tmp[1024];
-      map * errormap;
-      map *lenv;
-      lenv=getMapFromMaps(m,"lenv","message");
-      if(lenv!=NULL)
-        sprintf(tmp,_("Unable to run the Service. The message returned back by the Service was the following : %s"),lenv->value);
-      else
-        sprintf(tmp,_("Unable to run the Service. No more information was returned back by the Service."));
-      errormap = createMap("text",tmp);      
-      addToMap(errormap,"code", "InternalError");
-      printExceptionReportResponse(m,errormap);
-      freeMap(&errormap);
-      free(errormap);
     }
 }