Changeset 328 for trunk

Timestamp:

Aug 26, 2011, 3:53:26 PM (13 years ago)

Author:

djay

Message:

Fix bug #62. Use the same data structure in JS as in Python. Fix again bug #42.

Location:

trunk

Files:

• thirds/cgic206/cgic.c (modified) (1 diff)
• zoo-project/HISTORY.txt (modified) (1 diff)
• zoo-project/zoo-kernel/service_internal.h (modified) (1 diff)
• zoo-project/zoo-kernel/service_internal_js.c (modified) (3 diffs)
• zoo-project/zoo-kernel/zoo_service_loader.c (modified) (4 diffs)

trunk/thirds/cgic206/cgic.c

@@ -237 +237 @@
 
 
-        cgiTreatUrlEncoding=1;
+        cgiTreatUrlEncoding=0;
         if (cgiStrEqNc(cgiRequestMethod, "post")) {
                 cgiTreatUrlEncoding=0;

trunk/zoo-project/HISTORY.txt

@@ +1 @@
+Version 1.3.0-dev
+
+  * Support for dataInputs URLEncoded and xlink:href (ticket #62)
+  * Use the same object structure for JavaScript arguments than for Python
+
 Version 1.2.0-rc3
 

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

@@ -92 +92 @@
   void URLDecode(char *);
   char *url_encode(char *);
+  char *url_decode(char *);
   char* getEncoding(maps*);
 

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

@@ -77 +77 @@
 
   /* Create the global object. */
-  //global = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
-  global = JS_NewObject(cx, &global_class, NULL,NULL);
+  //#ifdef JS_NewCompartmentAndGlobalObject
+  global = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
+  //#else
+  //global = JS_NewObject(cx, &global_class, NULL,NULL);
+  //#endif
 
   /* Populate the global object with the standard globals,
@@ -284 +287 @@
 
 JSObject* JSObject_FromMaps(JSContext *cx,maps* t){
-  JSObject *res = JS_NewArrayObject(cx, 0, NULL);
+
+  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;
@@ -293 +299 @@
     JSObject *pval=JSObject_FromMap(cx,tmp->content);
     jsval pvalj=OBJECT_TO_JSVAL(pval);
-    JS_SetProperty(cx, res1, tmp->name, &pvalj);
-    JS_GetArrayLength(cx, res, &len);
-    jsval res1j = OBJECT_TO_JSVAL(res1);
-    JS_SetElement(cx,res,len,&res1j);
+    JS_SetProperty(cx, res, tmp->name, &pvalj);
+
 #ifdef JS_DEBUG
     fprintf(stderr,"Length of the Array %d, element : %s added \n",len,tmp->name);

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

@@ -924 +924 @@
      * Put each DataInputs into the inputs_as_text array
      */
+    char *tmp1=strdup(cursor_input);
     char * pToken;
     pToken=strtok(cursor_input,";");
+    if(pToken!=NULL && strncasecmp(pToken,tmp1,strlen(tmp1))==0){
+      char* tmp2=url_decode(tmp1);
+      snprintf(cursor_input,(strlen(tmp2)+1)*sizeof(char),"%s",tmp2);
+      free(tmp2);
+      pToken=strtok(cursor_input,";");
+    }
+    free(tmp1);
+
     char** inputs_as_text=(char**)calloc(100,sizeof(char*));
     if(inputs_as_text == NULL){
@@ -1019 +1028 @@
           else
             if(tmpv1!=NULL){
-              if(strncasecmp(tmpv1+1,"http://",7)!=0 &&
-                 strncasecmp(tmpv1+1,"ftp://",6)!=0){
+              char *tmpx2=url_decode(tmpv1+1);
+              if(strncasecmp(tmpx2,"http://",7)!=0 &&
+                 strncasecmp(tmpx2,"ftp://",6)!=0){
                 char emsg[1024];
                 sprintf(emsg,_("Unable to find a valid protocol to download the remote file %s"),tmpv1+1);
@@ -1036 +1046 @@
               fprintf(stderr,"REQUIRE TO DOWNLOAD A FILE FROM A SERVER : url(%s)\n",tmpv1+1);
 #endif
-              char *tmpx=url_encode(tmpv1+1);
-              addToMap(tmpmaps->content,tmpn1,tmpx);
+              addToMap(tmpmaps->content,tmpn1,tmpx2);
               
 #ifndef WIN32
@@ -1043 +1052 @@
 #endif
                 {
-                  loadRemoteFile(m,tmpmaps->content,hInternet,tmpv1+1);
+                  loadRemoteFile(m,tmpmaps->content,hInternet,tmpx2);
                 }
-              char *tmpx1=url_encode(tmpv1+1);
-              addToMap(tmpmaps->content,tmpn1,tmpx1);
-              free(tmpx1);
+              free(tmpx2);
               addToMap(tmpmaps->content,"Reference",tmpv1+1);
             }