[mapserver-commits] r12674 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-10-18 11:18:28 -0700 (Tue, 18 Oct 2011)
New Revision: 12674

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapwfs.c
Log:
Add missing support for outputFormat in WFS GetFeature POST XML requests (#4052)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-10-18 18:15:26 UTC (rev 12673)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-10-18 18:18:28 UTC (rev 12674)
@@ -14,6 +14,9 @@
 
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
+
+- Add missing support for outputFormat in WFS GetFeature POST XML requests (#4052)
+
 - Fixed schema validity issue for WCS 1.1 GetCoverage responses (#4047)
 
 - fix centroid geomtransform parser (#4029)

Modified: branches/branch-6-0/mapserver/mapwfs.c
===================================================================
--- branches/branch-6-0/mapserver/mapwfs.c	2011-10-18 18:15:26 UTC (rev 12673)
+++ branches/branch-6-0/mapserver/mapwfs.c	2011-10-18 18:18:28 UTC (rev 12674)
@@ -3205,7 +3205,11 @@
             if (pszValue)
               wfsparams->nStartIndex = atoi(pszValue);
             
-             /* free typname and filter. There may have been */
+            pszValue = xmlGetProp(rootnode, (xmlChar *)"outputFormat");
+            if (pszValue)
+              wfsparams->pszOutputFormat = msStrdup(pszValue);            
+
+            /* free typename and filter. There may have been */
             /* values if they were passed in the URL */
             if (wfsparams->pszTypeName)    
               free(wfsparams->pszTypeName);
@@ -3412,11 +3416,16 @@
                 if (pszValue)
                   wfsparams->nMaxFeatures = atoi(pszValue);
 
-                 pszValue = CPLGetXMLValue(psGetFeature,  "startIndex",
+                pszValue = CPLGetXMLValue(psGetFeature,  "startIndex",
                                                  NULL);
                 if (pszValue)
                   wfsparams->nStartIndex = atoi(pszValue);
 
+                pszValue = CPLGetXMLValue(psGetFeature, "outputFormat", 
+                                                 NULL);
+                if (pszValue)
+                  wfsparams->pszOutputFormat = msStrdup(pszValue);
+
                 psQuery = CPLGetXMLNode(psGetFeature, "Query");
                 if (psQuery)
                 {