Changeset 329 for trunk

Timestamp:

Aug 29, 2011, 11:01:40 PM (13 years ago)

Author:

djay

Message:

Store metapath even for POST requests. Correct load of js when metapath was used.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal_js.c (modified) (3 diffs)
• zoo_loader.c (modified) (1 diff)

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

@@ -103 +103 @@
    * Load the first part of the ZOO-API
    */
-  char api0[strlen(tmpm1->value)+strlen(ntmp)+15];
-  sprintf(api0,"%s/%sZOO-proj4js.js",ntmp,tmpm1->value);
+  char api0[strlen(tmpm1->value)+strlen(ntmp)+16];
+  sprintf(api0,"%s/%s/ZOO-proj4js.js",ntmp,tmpm1->value);
 #ifdef JS_DEBUG
   fprintf(stderr,"Trying to load %s\n",api0);
@@ -112 +112 @@
 
   char api1[strlen(tmpm1->value)+strlen(ntmp)+11];
-  sprintf(api1,"%s/%sZOO-api.js",ntmp,tmpm1->value);
+  sprintf(api1,"%s/%s/ZOO-api.js",ntmp,tmpm1->value);
 #ifdef JS_DEBUG
   fprintf(stderr,"Trying to load %s\n",api1);
@@ -126 +126 @@
   map* tmpm2=getMap(s->content,"serviceProvider");
 
-  char filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+2];
-  sprintf(filename,"%s/%s%s",ntmp,tmpm1->value,tmpm2->value);
-  filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+1]=0;
+  char filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+3];
+  sprintf(filename,"%s/%s/%s",ntmp,tmpm1->value,tmpm2->value);
+  filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+2]=0;
 #ifdef JS_DEBUG
   fprintf(stderr,"FILENAME %s\n",filename);

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

@@ -282 +282 @@
       xmlCleanupParser();
     }
+
+    char *token,*saveptr;
+    token=strtok_r(cgiQueryString,"&",&saveptr);
+    while(token!=NULL){
+      char *token1,*saveptr1;
+      char *name=NULL;
+      char *value=NULL;
+      token1=strtok_r(token,"=",&saveptr1);
+      while(token1!=NULL){
+        if(name==NULL)
+          name=strdup(token1);
+        else
+          value=strdup(token1);
+        token1=strtok_r(NULL,"=",&saveptr1);
+      }
+      if(strcasecmp(name,"metapath")==0)
+        addToMap(tmpMap,name,value);
+      free(name);
+      free(value);
+      token=strtok_r(NULL,"&",&saveptr);
+    }
+    
   }