[mapserver-commits] r8757 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-03-10 09:38:43 -0400 (Tue, 10 Mar 2009)
New Revision: 8757

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwfs.c
Log:
fix to output gml:boundedBy again (#2907)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-03-10 13:36:44 UTC (rev 8756)
+++ trunk/mapserver/HISTORY.TXT	2009-03-10 13:38:43 UTC (rev 8757)
@@ -33,6 +33,8 @@
 
 - add support for disabling SLD (#1395)
 
+- fix to output gml:boundedBy again (#2907)
+
 Version 5.4.0-beta3 (2009-3-5):
 --------------------------------
 

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2009-03-10 13:36:44 UTC (rev 8756)
+++ trunk/mapserver/mapwfs.c	2009-03-10 13:38:43 UTC (rev 8757)
@@ -974,7 +974,7 @@
 int msWFSGetFeature(mapObj *map, wfsParamsObj *paramsObj, cgiRequestObj *req)
   /* const char *wmtver, char **names, char **values, int numentries) */
 {
-  int         i, maxfeatures=-1;
+  int         i, j, maxfeatures=-1;
   const char *typename="";
   char       *script_url=NULL, *script_url_encoded;
   rectObj     bbox;
@@ -1532,10 +1532,10 @@
     }
 
     /* if no results where written (TODO: this needs to be GML2/3 specific I imagine */
-    for(i=0; i<map->numlayers; i++) {
-      if (GET_LAYER(map, i)->resultcache && GET_LAYER(map, i)->resultcache->numresults > 0)
+    for(j=0; j<map->numlayers; j++) {
+      if (GET_LAYER(map, j)->resultcache && GET_LAYER(map, j)->resultcache->numresults > 0)
       {
-        iNumberOfFeatures += GET_LAYER(map, i)->resultcache->numresults;
+        iNumberOfFeatures += GET_LAYER(map, j)->resultcache->numresults;
         break;
       }
     }
@@ -1655,7 +1655,7 @@
     if(maxfeatures != 0 && iResultTypeHits == 0)
       msGMLWriteWFSQuery(map, stdout, maxfeatures, pszNameSpace, outputformat);
 
-    if (((i==map->numlayers) || (maxfeatures == 0)) && iResultTypeHits == 0) {
+    if (((j==map->numlayers) || (maxfeatures == 0)) && iResultTypeHits == 0) {
       msIO_printf("   <gml:boundedBy>\n"); 
       msIO_printf("      <gml:null>missing</gml:null>\n");
       msIO_printf("   </gml:boundedBy>\n");