Changeset 410 for trunk

Timestamp:

Apr 3, 2013, 7:31:35 PM (12 years ago)

Author:

djay

Message:

Fix for JavaScript? support.

File:

• trunk/zoo-project/zoo-kernel/service_internal_js.c (modified) (1 diff)

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

@@ -410 +410 @@
     fprintf(stderr,"tmap is not null ! (%s = %s)\n",tmap->name,tmap->value);
 #endif
-  if(isArray==NULL){
-    while(tmpm!=NULL){
-      jsval jsstr;
-      if(isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0)
-        jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,atoi(isBinary->value)));
-      else
-        jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,strlen(tmpm->value)));
-      JS_SetProperty(cx, res, tmpm->name,&jsstr);
-#ifdef JS_DEBUG
-      fprintf(stderr,"[JS] %s => %s\n",tmpm->name,tmpm->value);
-#endif
-      tmpm=tmpm->next;
-    }
-  }
-  else{
+  while(tmpm!=NULL){
+    jsval jsstr;
+    if((isArray==NULL && isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0))
+      jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,atoi(isBinary->value)));
+    else
+      jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,strlen(tmpm->value)));
+    JS_SetProperty(cx, res, tmpm->name,&jsstr);
+#ifdef JS_DEBUG
+    fprintf(stderr,"[JS] %s => %s\n",tmpm->name,tmpm->value);
+#endif
+    tmpm=tmpm->next;
+  }
+  if(isArray!=NULL){
     map* len=getMap(t,"length");
     int cnt=atoi(len->value);