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

Timestamp:

Dec 19, 2016, 6:01:06 PM (7 years ago)

Author:

djay

Message:

Add support for nested inputs and outputs.

File:

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

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

@@ -425 +425 @@
   while(tmp!=NULL){
     JSObject *pval=JSObject_FromMap(cx,tmp->content);
+    if(tmp->child!=NULL){
+      JSObject *pvalc=JSObject_FromMaps(cx,tmp->child);
+      jsval pvaljc=OBJECT_TO_JSVAL(pvalc);
+      JS_SetProperty(cx, pval, "child", &pvaljc);
+    }
     jsval pvalj=OBJECT_TO_JSVAL(pval);
     JS_SetProperty(cx, res, tmp->name, &pvalj);
@@ -548 +553 @@
         
         tmp=JS_EncodeString(cx,jsmsg);
-        tres=(maps*)malloc(MAPS_SIZE);
-        tres->name=zStrdup(tmp);
-        tres->content=NULL;
-        tres->next=NULL;
+        tres=createMaps(tmp);
 
         jsval nvp=JSVAL_NULL;
@@ -567 +569 @@
         }
 
+        jsval nvp0=JSVAL_NULL;
+        JSObject *nvp01=JSVAL_TO_OBJECT(JSVAL_NULL);
+        if((JS_GetProperty(cx, nvp1, "child", &nvp0)==JS_FALSE)){
+#ifdef JS_DEBUG
+          fprintf(stderr,"Enumerate id : %d => %s => No more value\n",oi,tmp);
+#endif
+        }
+        JS_ValueToObject(cx,nvp0,&nvp01);
+        jsval nvp01j=OBJECT_TO_JSVAL(nvp01);
+        if(!JSVAL_IS_NULL(nvp01j)){
+          tres->child=mapsFromJSObject(cx,nvp01j);
+        }
+
         if(res==NULL)
           res=dupMaps(&tres);
@@ -574 +589 @@
         free(tres);
         tres=NULL;
-                
       }
       JS_DestroyIdArray(cx,idp);
@@ -725 +739 @@
       fprintf(stderr,"Enumerate id : %d [ %s => %s ]\n",index,tmp,tmp1);
 #endif
-      if(res!=NULL){
-#ifdef JS_DEBUG
-        fprintf(stderr,"%s - %s\n",tmp,tmp1);
-#endif
-        addToMap(res,tmp,tmp1);
-      }
-      else{
-        res=createMap(tmp,tmp1);
-        res->next=NULL;
+      if(strcasecmp(tmp,"child")!=0){
+        if(res!=NULL){
+#ifdef JS_DEBUG
+          fprintf(stderr,"%s - %s\n",tmp,tmp1);
+#endif
+          addToMap(res,tmp,tmp1);
+        }
+        else{
+          res=createMap(tmp,tmp1);
+          res->next=NULL;
+        }
       }
       free(tmp);