Changeset 380 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

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

Author:

djay

Message:

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

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (2 diffs)

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;
+      }
     }