Changeset 418 for trunk

Timestamp:

Jun 27, 2013, 11:18:37 PM (11 years ago)

Author:

djay

Message:

Fix issue #78.

File:

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

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

@@ -1673 +1673 @@
             addMapsToMaps(&request_input_real_format,tmpmaps);
         }
-        
+
 #ifdef DEBUG
         fprintf(stderr,"******TMPMAPS*****\n");
@@ -1749 +1749 @@
         while(cur1!=NULL && cur1->type != XML_ELEMENT_NODE)
           cur1=cur1->next;
+        int cur1cnt=0;
         while(cur1){
           /**
@@ -1769 +1770 @@
               tmpmaps->name=strdup((char*)val);
             }
+            if(asRaw==true)
+              addToMap(request_inputs,"RawDataOutput",(char*)val);
+            else{
+              if(cur1cnt==0)
+                addToMap(request_inputs,"ResponseDocument",(char*)val);
+              else{
+                map* tt=getMap(request_inputs,"ResponseDocument");
+                char* tmp=strdup(tt->value);
+                free(tt->value);
+                tt->value=(char*)malloc((strlen(tmp)+strlen((char*)val)+1)*sizeof(char));
+                sprintf(tt->value,"%s;%s",tmp,(char*)val);
+                free(tmp);
+              }
+            }
+            cur1cnt+=1;
             xmlFree(val);
           }
@@ -1869 +1885 @@
                 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)
@@ -1883 +1895 @@
         }
       }
+      if(request_output_real_format==NULL)
+        request_output_real_format=dupMaps(&tmpmaps);
+      else
+        addMapsToMaps(&request_output_real_format,tmpmaps);
       if(tmpmaps!=NULL){
         freeMaps(&tmpmaps);