Changeset 26 for trunk/zoo-kernel/service_internal_js.c

Timestamp:

Sep 24, 2010, 5:11:43 AM (14 years ago)

Author:

djay

Message:

ZOO-Kernel updates and bug fixes :

• Fixing gestion of RawDataOutput? when the Service return SERVICE_FAILED an ExceptionReport? was returned to the client.
• Use gcc when compiling service_internal.c to avoid strange error messages about switch ....
• Function setMapInMaps was added in service.h to let users set the value of a specific map in a maps.
• Fixing JavaScript? issue during the context destruction process.
• Use the GetStatus? ZOO Service when it is available on the local installation for statusLocation.
• Add some comments for ServiceStarted?, ServiceSucceeded?, ServiceFailed? and ServiceAccepted?.
• Dynamic creation of a lenv maps in the main configuration file maps, containing the current status and a sid (Service ID). Those informations can be used later by the GetStatus? Service to let user check the on-going status during the Service runs.
• Function updateStatus was added to service_internal.h which let the Services developers set the current percentCompleted value.

ZOO-Service updates and bug fixes :

• Add GetStatus? Service and its demo longProcess Service. All are in the wps_status.zo Services Provider.
• Use the setMapInMaps in the base-vect-ops code to enhance readibility.

ZOO-API updates :

• Add the function ZOO.UpdateStatus? to the ZOO JavaScript? API which simply point on ZOOUpdateStatus which can be called as-is from JavaScript?. Use : ZOOUpdateStatus(conf,value) where conf is the main configuration file maps and value the the value of the current status.

File:

• trunk/zoo-kernel/service_internal_js.c (modified) (6 diffs)

trunk/zoo-kernel/service_internal_js.c

@@ -23 +23 @@
  */
 
-#include "service_internal_js.h"
+#include "service_internal.h"
 
 static char dbg[1024];
@@ -74 +74 @@
   if (!JS_DefineFunction(cx, global, "ZOORequest", JSRequest, 4, 0))
     return 1;
+  if (!JS_DefineFunction(cx, global, "ZOOUpdateStatus", JSUpdateStatus, 2, 0))
+    return 1;
 
   /* Your application code here. This may include JSAPI calls
@@ -82 +84 @@
   map* tmpm1=getMap(request,"metapath");
   map* tmpm2=getMap(s->content,"serviceProvider");
-  char filename[strlen(tmpm1->value)+strlen(tmpm2->value)+6];
   char ntmp[1024];
   getcwd(ntmp,1024);
+  char filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+2];
   sprintf(filename,"%s/%s%s",ntmp,tmpm1->value,tmpm2->value);
+  filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+1]=0;
+  fprintf(stderr,"FILENAME %s\n",filename);
   struct stat file_status;
   stat(filename, &file_status);
@@ -203 +207 @@
 
   /* Cleanup. */
-  // The JS_MaybeGC call imply segmentation fault
-  //JS_MaybeGC(cx);
   JS_DestroyScript(cx, script);
+  JS_MaybeGC(cx);
   // If we use the DestroyContext as requested to release memory then we get 
   // issue getting back the main configuration maps after coming back to the 
@@ -387 +390 @@
 #endif
       if(res!=NULL){
+#ifdef JS_DEBUG
         fprintf(stderr,"%s - %s\n",JS_GetStringBytes(jsmsg),JS_GetStringBytes(jsmsg1));
+#endif
         addToMap(res,JS_GetStringBytes(jsmsg),JS_GetStringBytes(jsmsg1));
       }
@@ -394 +399 @@
         res->next=NULL;
       }
+#ifdef JS_DEBUG
       dumpMap(res);
+#endif
     }
   }