Changeset 344

Timestamp:

Oct 30, 2011, 9:14:19 PM (13 years ago)

Author:

djay

Message:

Fix download file for JS api. Decode value of Datainputs.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.c (modified) (1 diff)
• ulinet.c (modified) (1 diff)
• zoo_service_loader.c (modified) (2 diffs)

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

@@ -2479 +2479 @@
     fsize=res.nDataLen;
   }
+  if(fsize==0){
+    return errorException(m, _("Unable to download the file."), "InternalError");
+  }
   map* tmpMap=getMapOrFill(content,"value","");
   free(tmpMap->value);

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

@@ -486 +486 @@
   size_t dwRead;
   InternetReadFile(res,(LPVOID)tmpValue,res.nDataLen,&dwRead);
+  fprintf(stderr,"content downloaded (%d) (%s) \n",dwRead,tmpValue);
+  if(dwRead==0){
+    JS_SET_RVAL(cx, argv1,STRING_TO_JSVAL(JS_NewStringCopyN(cx,"Unable to access the file.",strlen("Unable to access the file."))));
+    return JS_TRUE;
+  }
+
 #ifdef ULINET_DEBUG
   fprintf(stderr,"content downloaded (%d) (%s) \n",dwRead,tmpValue);

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

@@ -768 +768 @@
   
   /**
-   * Create the input maps data structure
+   * Create the input and output maps data structure
    */
   int i=0;
@@ -986 +986 @@
           }
           tmpmaps->name=strdup(tmpn);
-          if(tmpv!=NULL)
-            tmpmaps->content=createMap("value",tmpv+1);
+          if(tmpv!=NULL){
+            char *tmpvf=url_decode(tmpv+1);
+            tmpmaps->content=createMap("value",tmpvf);
+            free(tmpvf);
+          }
           else
             tmpmaps->content=createMap("value","Reference");