Changeset 640 for trunk/zoo-project/zoo-kernel/service_internal_js.c

Timestamp:

May 28, 2015, 4:25:06 PM (9 years ago)

Author:

djay

Message:

First version including zoo_service shared library

File:

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

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

@@ -23 +23 @@
  */
 
-#include "service_internal.h"
+#include "service_internal_js.h"
+#include "response_print.h"
 
 #ifndef JSCLASS_GLOBAL_FLAGS
@@ -67 +68 @@
 JSLoadScripts(JSContext *cx, uintN argc, jsval *argv1)
 {
-  //map* request = JS_GetContextPrivate(cx);
-  //map* tmpm1=getMap(request,"metapath");
   JS_MaybeGC(cx);
 
@@ -78 +77 @@
   JS_MaybeGC(cx);
   for(i=0;i<argc;i++){
-    JSString* jsmsg = JS_ValueToString(cx,argv[i]);
     char *filename = JSValToChar(cx,&argv[i]);
     char *api0=(char*)malloc((strlen(ntmp)+strlen(filename)+2)*sizeof(char));
@@ -110 +108 @@
 int zoo_js_support(maps** main_conf,map* request,service* s,maps **inputs,maps **outputs)
 {
-  maps* main=*main_conf;
+  /*maps* main=*main_conf;
   maps* _inputs=*inputs;
-  maps* _outputs=*outputs;
+  maps* _outputs=*outputs;*/
 
   /* The class of the global object. */
@@ -202 +200 @@
   /* Your application code here. This may include JSAPI calls
      to create your own custom JS objects and run scripts. */
-  maps* out=*outputs;
+  //maps* out=*outputs;
   int res=SERVICE_FAILED;
-  maps* mc=*main_conf;
+  //maps* mc=*main_conf;
   map* tmpm2=getMap(s->content,"serviceProvider");
 
@@ -216 +214 @@
   stat(filename, &file_status);
   //char *source=(char*)malloc(file_status.st_size);
-  uint16 lineno;
+  //uint16 lineno;
   jsval rval;
   JSBool ok ;
@@ -281 +279 @@
   }
 
-  jsval t=OBJECT_TO_JSVAL(d);
+  //jsval t=OBJECT_TO_JSVAL(d);
   if(JS_IsArrayObject(cx,d)){
 #ifdef JS_DEBUG
@@ -395 +393 @@
   if(s==0){
     jsval rval;
-    JSBool ok ;
     JSObject *script = JS_CompileFile(cx, JS_GetGlobalObject(cx), filename);
     if(script!=NULL){
@@ -425 +422 @@
 JSObject* JSObject_FromMaps(JSContext *cx,maps* t){
   JSObject* res=JS_NewObject(cx, NULL, NULL, NULL);
-  //JSObject *res = JS_NewArrayObject(cx, 0, NULL);
   if(res==NULL)
     fprintf(stderr,"Array Object is NULL!\n");
   maps* tmp=t;
   while(tmp!=NULL){
-    jsuint len;
-    JSObject* res1=JS_NewObject(cx, NULL, NULL, NULL);
     JSObject *pval=JSObject_FromMap(cx,tmp->content);
     jsval pvalj=OBJECT_TO_JSVAL(pval);
@@ -452 +446 @@
 JSObject* JSObject_FromMap(JSContext *cx,map* t){
   JSObject* res=JS_NewObject(cx, NULL, NULL, NULL);
-  jsval resf =  OBJECT_TO_JSVAL(res);
   map* tmpm=t;
   map* isArray=getMap(t,"isArray");
@@ -463 +456 @@
     fprintf(stderr,"tmap is not null ! (%s = %s)\n",tmap->name,tmap->value);
 #endif
-  while(tmpm!=NULL){
+  while(isArray==NULL && tmpm!=NULL){
     jsval jsstr;
-    if((isArray==NULL && isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0))
+    if((isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0))
       jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,atoi(isBinary->value)));
     else
@@ -534 +527 @@
         jsval id = idp->vector[index];
         jsval vp;
-        JSString* str; 
         JS_IdToValue(cx,id,&vp);
-        char *c, *tmp;
+        char *tmp;
         JSString *jsmsg;
         size_t len1;
@@ -583 +575 @@
   fprintf(stderr,"outputs array length : %d\n",len);
 #endif
-  for(oi=0;oi < len;oi++){
+  for(oi=0;hasLen && oi < len;oi++){
 #ifdef JS_DEBUG
     fprintf(stderr,"outputs array length : %d step %d \n",len,oi);
@@ -605 +597 @@
         jsval id = idp->vector[index];
         jsval vp;
-        JSString* str; 
         JS_IdToValue(cx,id,&vp);
-        char *c, *tmp;
+        char *tmp;
         JSString *jsmsg;
         size_t len1;
@@ -706 +697 @@
       jsval id = idp->vector[index];
       jsval vp;
-      JSString* str; 
       JS_IdToValue(cx,id,&vp);
-      char *c, *tmp, *tmp1;
+      char *tmp, *tmp1;
       JSString *jsmsg,*jsmsg1;
       size_t len,len1;
@@ -877 +867 @@
   jsval *argv = JS_ARGV(cx,argv1);
   HINTERNET hInternet;
-  HINTERNET res;
-  HINTERNET res1;
   JSObject *header;
   char *url;
@@ -884 +872 @@
   char* tmpValue;
   size_t dwRead;
-  int i=0;
   JS_MaybeGC(cx);
   hInternet=InternetOpen("ZooWPSClient\0",