Changeset 336 for trunk

Timestamp:

Sep 22, 2011, 2:59:40 PM (13 years ago)

Author:

djay

Message:

Add support for importScript javascript function

Location:

trunk/zoo-project

Files:

• HISTORY.txt (modified) (1 diff)
• zoo-kernel/service_internal_js.c (modified) (2 diffs)

trunk/zoo-project/HISTORY.txt

@@ -3 +3 @@
   * Support for dataInputs URLEncoded and xlink:href (ticket #62)
   * Use the same object structure for JavaScript arguments than for Python
+  * Add the Normalized Difference Vegetation Index service
+  * Add importScripts function to JavaScript support (ticket #66)
 
 Version 1.2.0-rc3

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

@@ -42 +42 @@
 }
 
+JSBool 
+JSLoadScripts(JSContext *cx, uintN argc, jsval *argv1)
+{
+  map* request = JS_GetContextPrivate(cx);
+  map* tmpm1=getMap(request,"metapath");
+  JS_MaybeGC(cx);
+
+  char ntmp[1024];
+  getcwd(ntmp,1024);
+
+  jsval *argv = JS_ARGV(cx,argv1);
+  int i=0;
+  JS_MaybeGC(cx);
+  for(i=0;i<argc;i++){
+    JSString* jsmsg = JS_ValueToString(cx,argv[i]);
+    char *filename = JSValToChar(cx,&argv[i]);
+    char api0[strlen(tmpm1->value)+strlen(ntmp)+strlen(filename)+2];
+    sprintf(api0,"%s/%s/%s",ntmp,tmpm1->value,filename);
+#ifdef JS_DEBUG
+    fprintf(stderr,"Trying to load %s\n",api0);
+#endif
+    JSObject *api_script1=loadZooApiFile(cx,JS_GetGlobalObject(cx),api0);
+    fflush(stderr);
+  }
+  JS_MaybeGC(cx);
+  JS_SET_RVAL(cx, argv1, JSVAL_VOID);
+  
+  return JS_TRUE;
+}
+
+
 int zoo_js_support(maps** main_conf,map* request,service* s,
                    maps **inputs,maps **outputs)
@@ -94 +125 @@
     return 1;
   if (!JS_DefineFunction(cx, global, "alert", JSAlert, 2, 0))
+    return 1;  
+  if (!JS_DefineFunction(cx, global, "importScripts", JSLoadScripts, 1, 0))
     return 1;
 
+  /**
+   * Add private context object
+   */
+  void* cxPrivate = request;
+  JS_SetContextPrivate(cx,cxPrivate);
+    
   map* tmpm1=getMap(request,"metapath");
   char ntmp[1024];