Changeset 42

Timestamp:

Nov 10, 2010, 6:56:18 AM (14 years ago)

Author:

djay

Message:

Enhance the JavaScript? support by automatically load the ZOO-api.js and ZOO-proj4js.js file before loading the JavaScript? service. This way no more need to integrate the whole ZOO-api.js and proj4js.js files into the JavaScript? service provider code.

Location:

trunk/zoo-kernel

Files:

• service_internal_js.c (modified) (4 diffs)
• service_internal_js.h (modified) (1 diff)

trunk/zoo-kernel/service_internal_js.c

@@ -77 +77 @@
     return 1;
 
+  map* tmpm1=getMap(request,"metapath");
+  char ntmp[1024];
+  getcwd(ntmp,1024);
+
+  /**
+   * Load the first part of the ZOO-API
+   */
+  char api0[strlen(tmpm1->value)+strlen(ntmp)+15];
+  sprintf(api0,"%s/%sZOO-proj4js.js",ntmp,tmpm1->value);
+  fprintf(stderr,"Trying to load %s\n",api0);
+  JSScript *api_script1=loadZooApiFile(cx,global,api0);
+  fflush(stderr);
+
+  char api1[strlen(tmpm1->value)+strlen(ntmp)+11];
+  sprintf(api1,"%s/%sZOO-api.js",ntmp,tmpm1->value);
+  fprintf(stderr,"Trying to load %s\n",api1);
+  JSScript *api_script2=loadZooApiFile(cx,global,api1);
+  fflush(stderr);
+
   /* Your application code here. This may include JSAPI calls
      to create your own custom JS objects and run scripts. */
@@ -82 +101 @@
   int res=SERVICE_FAILED;
   maps* mc=*main_conf;
-  map* tmpm1=getMap(request,"metapath");
   map* tmpm2=getMap(s->content,"serviceProvider");
-  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);
@@ -208 +225 @@
   /* Cleanup. */
   JS_DestroyScript(cx, script);
+  JS_DestroyScript(cx, api_script1);
+  JS_DestroyScript(cx, api_script2);
   //JS_MaybeGC(cx);
   // If we use the DestroyContext as requested to release memory then we get 
@@ -219 +238 @@
 #endif
   return res;
+}
+
+JSScript * loadZooApiFile(JSContext *cx,JSObject  *global, char* filename){
+  struct stat api_status;
+  int s=stat(filename, &api_status);
+  if(s==0){
+    jsval rval;
+    FILE *jsfile=fopen(filename,"r");
+    JSBool ok ;
+    JSScript *script = JS_CompileFileHandle(cx, global, filename,jsfile);
+    if(script!=NULL){
+      (void)JS_ExecuteScript(cx, global, script, &rval);
+      fprintf(stderr,"**************\n%s correctly loaded\n**************\n",filename);
+      return script;
+    }
+    else
+      fprintf(stderr,"\n**************\nUnable to run %s\n**************\n",filename);
+  }
+  else
+    fprintf(stderr,"\n**************\nUnable to load %s\n**************\n",filename);
+  return NULL;
 }
 

trunk/zoo-kernel/service_internal_js.h

@@ -52 +52 @@
   int zoo_js_support(maps**,map*,service*,maps **,maps **);
 
+  JSScript *loadZooApiFile(JSContext*,JSObject*,char*);
+
 #ifdef __cplusplus
 }