Changeset 380 for trunk

Timestamp:

Dec 27, 2012, 5:00:12 PM (12 years ago)

Author:

djay

Message:

Update to support multiple outputs provided in a XML POST request.

Location:

trunk/zoo-project

Files:

• HISTORY.txt (modified) (1 diff)
• zoo-kernel/zoo_loader.c (modified) (3 diffs)
• zoo-kernel/zoo_service_loader.c (modified) (2 diffs)

trunk/zoo-project/HISTORY.txt

@@ -11 +11 @@
   * Add Python ZOO-API to access ZOO-Kernel internel functions
   * Add a [headers] section in main.cfg file to add specifics to header returned
-  * Add support for multiple outputs
+  * Add support for multiple outputs for both GET and POST requests
 
 Version 1.2.0-rc3

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

@@ -78 +78 @@
   fprintf (stderr, "RequestMethod: (%s) %d %d\n", cgiRequestMethod,strncasecmp(cgiRequestMethod,"post",4),strncmp(cgiContentType,"text/xml",8)==0 || strncasecmp(cgiRequestMethod,"post",4)==0); 
   fprintf (stderr, "Request: %s\n", cgiQueryString);
+  fprintf (stderr, "ContentType: %s\n", cgiContentType);
+  fprintf (stderr, "ContentLength: %d\n", cgiContentLength);
   fflush(stderr);
 #endif
@@ -112 +114 @@
     }else{
       char *buffer=new char[cgiContentLength+1];
-      if(fread(buffer,sizeof(char),cgiContentLength,cgiIn)){
+      int r=0;
+      if((r=fread(buffer,sizeof(char),cgiContentLength,cgiIn))!=0){
         buffer[cgiContentLength]=0;
         tmpMap=createMap("request",buffer);
@@ -209 +212 @@
               addToMap(tmpMap,"xrequest",(char*)xmlbuff);
               char *tmp=(char*)xmlbuff;
-              fprintf(stderr,"%s\n",tmp);
               xmlFree(xmlbuff);
             }

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

@@ -1805 +1805 @@
                   tmpmaps->next=NULL;
                 }
-                else
+                else{
+                  if(tmpmaps->name!=NULL)
+                    free(tmpmaps->name);
                   tmpmaps->name=strdup((char*)val);;
+                }
                 xmlFree(val);
               }
@@ -1835 +1838 @@
                 xmlFree(val);
               }
+              if(request_output_real_format==NULL)
+                request_output_real_format=dupMaps(&tmpmaps);
+              else
+                addMapsToMaps(&request_output_real_format,tmpmaps);
               cur2=cur2->next;
+              while(cur2!=NULL && cur2->type != XML_ELEMENT_NODE)
+                cur2=cur2->next;
             }
           }
           cur1=cur1->next;
+          while(cur1!=NULL && cur1->type != XML_ELEMENT_NODE)
+            cur1=cur1->next;
         }
       }
-      if(request_output_real_format==NULL)
-        request_output_real_format=dupMaps(&tmpmaps);
-      else
-        addMapsToMaps(&request_output_real_format,tmpmaps);
-#ifdef DEBUG
-      dumpMaps(tmpmaps);
-#endif
-      freeMaps(&tmpmaps);
-      free(tmpmaps);
+      if(tmpmaps!=NULL){
+        freeMaps(&tmpmaps);
+        free(tmpmaps);
+        tmpmaps=NULL;
+      }
     }