Changeset 625 for trunk

Timestamp:

Apr 10, 2015, 11:12:37 PM (10 years ago)

Author:

djay

Message:

Fix in JS ZOO-API for accessing reference(s).

Location:

trunk/zoo-project

Files:

• zoo-api/js/ZOO-api.js (modified) (2 diffs)
• zoo-kernel/request_parser.c (modified) (5 diffs)

trunk/zoo-project/zoo-api/js/ZOO-api.js

@@ -3671 +3671 @@
     var outputs = node.*::ProcessOutputs.*::Output;
     if (outputs.length() > 0) {
-      var data = outputs[0].*::Data.*::*[0];
-      var builder = this.parseData[data.localName().toLowerCase()];
-      if (builder)
-        return builder.apply(this,[data]);
-      else
-        return null;
+      var res=[];
+      for(var i=0;i<outputs.length();i++){
+        var data = outputs[i].*::Data.*::*[0];
+        if(!data){
+          data = outputs[i].*::Reference;
+        }
+        var builder = this.parseData[data.localName().toLowerCase()];
+        if (builder)
+          res.push(builder.apply(this,[data]));
+        else
+          res.push(null);
+      }
+      return res.length>1?res:res[0];
     } else
       return null;
@@ -3734 +3741 @@
      */
     'reference': function(node) {
-      var result = {type:'reference',value:node.*::href};
+      var result = {type:'reference',value:node.@href};
       return result;
     }

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

@@ -146 +146 @@
   if (r_inputs != NULL){
     //snprintf (cursor_input, 40960, "%s", r_inputs->value);
-    cursor_input = zStrdup (r_inputs->value);
+    if(strstr(r_inputs->value,"=")==NULL)
+      cursor_input = url_decode (r_inputs->value);
+    else
+      cursor_input = zStrdup (r_inputs->value);
     int j = 0;
 
@@ -1181 +1184 @@
 int xmlParseRequest(maps** main_conf,const char* post,map** request_inputs,service* s,maps** inputs,maps** outputs,HINTERNET* hInternet){
   xmlInitParser ();
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
   xmlDocPtr doc = xmlParseMemory (post, cgiContentLength);
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
 
   /**
@@ -1198 +1199 @@
   }
   xmlXPathFreeObject (tmpsptr);
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
 
   // Extract ResponseDocument / RawDataOutput from the XML Request 
   tmpsptr =
     extractFromDoc (doc, "/*/*/*[local-name()='ResponseDocument']");
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
   bool asRaw = false;
   tmps = tmpsptr->nodesetval;
   if (tmps->nodeNr == 0)
     {
-      fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
       xmlXPathFreeObject (tmpsptr);
       tmpsptr =
@@ -1216 +1214 @@
     }
   if(tmps->nodeNr != 0){
-    fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
     if(xmlParseOutputs(main_conf,request_inputs,outputs,doc,tmps->nodeTab[0],asRaw)<0){
       xmlXPathFreeObject (tmpsptr);
@@ -1224 +1221 @@
     }
   }
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
   xmlXPathFreeObject (tmpsptr);
   xmlFreeDoc (doc);