Changeset 718 for trunk

Timestamp:

Jul 1, 2015, 12:25:29 AM (9 years ago)

Author:

djay

Message:

Fix parsing issue with GetResult?, GetStatus? and Dismiss POST requests.

File:

• trunk/zoo-project/zoo-kernel/zoo_loader.c (modified) (4 diffs)

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

@@ -250 +250 @@
         xmlFree(tval);
       }
-      const char* requests[3]={"GetCapabilities","DescribeProcess","Execute"};
-      for(int j=0;j<3;j++){
+      const char* requests[6]={"GetCapabilities","DescribeProcess","Execute","GetStatus","GetResult","Dismiss"};
+      for(int j=0;j<6;j++){
         char tt[128];
         sprintf(tt,"/*[local-name()='%s']",requests[j]);
@@ -264 +264 @@
               free(t1->value);
             t1->value=zStrdup(requests[j]);
-            j=2;
+            j=5;
           }
           xmlXPathFreeObject(reqptr);
@@ -320 +320 @@
             }
             xmlXPathFreeObject(idptr);
-            addToMap(tmpMap,"Identifier",identifiers);
+            if(identifiers[0]!=0)
+              addToMap(tmpMap,"Identifier",identifiers);
             free(identifiers);
           }
-        }else{
+        }
+        if(getMap(tmpMap,"Identifier")==NULL){
           idptr=extractFromDoc(doc,"/*/*[local-name()='JobID']");
           if(idptr!=NULL){
@@ -332 +334 @@
               identifiers[0]=0;
               for(int k=0;k<id->nodeNr;k++){
-                xmlChar* content=xmlNodeListGetString(doc, id->nodeTab[k]->xmlChildrenNode,1);
-                if(strlen(identifiers)>0){
-                  char *tmp=zStrdup(identifiers);
-                  snprintf(identifiers,strlen(tmp)+xmlStrlen(content)+2,"%s,%s",tmp,content);
-                  free(tmp);
-                }
-                else{
-                  snprintf(identifiers,xmlStrlen(content)+1,"%s",content);
-                }
-                xmlFree(content);
+                  xmlChar* content=xmlNodeListGetString(doc, id->nodeTab[k]->xmlChildrenNode,1);
+                  if(strlen(identifiers)>0){
+                    char *tmp=zStrdup(identifiers);
+                    snprintf(identifiers,strlen(tmp)+xmlStrlen(content)+2,"%s,%s",tmp,content);
+                    free(tmp);
+                  }
+                  else{
+                    snprintf(identifiers,xmlStrlen(content)+1,"%s",content);
+                  }
+                  xmlFree(content);
               }
               xmlXPathFreeObject(idptr);
-              addToMap(tmpMap,"JobID",identifiers);
+              if(identifiers[0]!=0)
+                addToMap(tmpMap,"JobID",identifiers);
               free(identifiers);
             }
-        }
+          }
         }
       }