[mapserver-commits] r8655 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-03-07 14:54:50 -0500 (Sat, 07 Mar 2009)
New Revision: 8655

Modified:
   trunk/mapserver/mapwfs.c
Log:
move srs fetching to query element (#2899)


Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2009-03-07 19:32:34 UTC (rev 8654)
+++ trunk/mapserver/mapwfs.c	2009-03-07 19:54:50 UTC (rev 8655)
@@ -2018,11 +2018,6 @@
                 if (pszValue)
                   wfsparams->nMaxFeatures = atoi(pszValue);
 
-                pszValue = (char*)CPLGetXMLValue(psGetFeature,  "srsName",
-                                                 NULL);
-                if (pszValue)
-                  wfsparams->pszSrs = strdup(pszValue);
-
                 psQuery = CPLGetXMLNode(psGetFeature, "Query");
                 if (psQuery)
                 {
@@ -2050,6 +2045,12 @@
                     while (psQuery &&  psQuery->pszValue && 
                            strcasecmp(psQuery->pszValue, "Query") == 0)
                     {
+                        /* get SRS */
+                        pszValue = (char*)CPLGetXMLValue(psGetFeature,  "srsName",
+                                                 NULL);
+                        if (pszValue)
+                          wfsparams->pszSrs = strdup(pszValue);
+
                         /* parse typenames */
                         pszValue = (char*)CPLGetXMLValue(psQuery,  
                                                          "typename", NULL);