WFS: deal with multiple <Query> in a stored query

MapServer · Nov 9, 2013 · 3b092a3 · 3b092a3
1 parent f8bc861
commit 3b092a3
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/mapwfs.c b/mapwfs.c
@@ -4316,6 +4316,7 @@ static int msWFSAnalyzeStoredQuery(mapObj* map,
 {
     CPLXMLNode* psRoot;
     CPLXMLNode* psQuery;
+    CPLXMLNode* psIter;
 
     psRoot = CPLParseXMLString(pszResolvedQuery);
 
@@ -4336,7 +4337,14 @@ static int msWFSAnalyzeStoredQuery(mapObj* map,
         return MS_FAILURE;
     }
 
-    msWFSParseXMLQueryNode(psQuery, wfsparams);
+    psIter = psQuery;
+    while( psIter != NULL )
+    {
+        if( psIter->eType == CXT_Element && strcmp(psIter->pszValue, "Query") == 0 ) {
+            msWFSParseXMLQueryNode(psIter, wfsparams);
+        }
+        psIter = psIter->psNext;
+    }
 
     CPLDestroyXMLNode(psRoot);