[mapserver-commits] r9313 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-09-16 14:29:25 -0400 (Wed, 16 Sep 2009)
New Revision: 9313

Modified:
   trunk/mapserver/mapogcfilter.c
Log:
no need to open/close layer which is already done in msQueryxxx functions #3069

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2009-09-15 22:34:46 UTC (rev 9312)
+++ trunk/mapserver/mapogcfilter.c	2009-09-16 18:29:25 UTC (rev 9313)
@@ -604,9 +604,14 @@
     psLayer->resultcache->bounds.maxx = -1;
     psLayer->resultcache->bounds.maxy = -1;
 
+    /*
+      At this point a msQuery was called successfully and the layer is still open.
+      No need to reopen it and close it.
+      These changes are related to RFC #52 Bug 3069
     status = msLayerOpen(psLayer);
     if (status != MS_SUCCESS) 
       return;
+    */
     annotate = msEvalContext(map, psLayer, psLayer->labelrequires);
     if(map->scaledenom > 0) 
     {
@@ -642,8 +647,11 @@
           msMergeRect(&(psLayer->resultcache->bounds), &shape.bounds);
     }
 
-    msLayerClose(psLayer);
-
+    /*
+      At this point a msQuery was called successfully and the layer is still open.
+      No need to reopen and close it. These changes are related to RFC #52 Bug 3069.
+      msLayerClose(psLayer);
+    */
 }
 
 /************************************************************************/