[mapserver-commits] r9064 - trunk/mapserver/mapscript/swiginc

[svn at osgeo.org]

Author: sdlime
Date: 2009-06-02 08:56:50 -0400 (Tue, 02 Jun 2009)
New Revision: 9064

Modified:
   trunk/mapserver/mapscript/swiginc/layer.i
Log:
Fixed whichShapes() to respect filters AND return all items. (#2689)

Modified: trunk/mapserver/mapscript/swiginc/layer.i
===================================================================
--- trunk/mapserver/mapscript/swiginc/layer.i	2009-06-02 12:38:55 UTC (rev 9063)
+++ trunk/mapserver/mapscript/swiginc/layer.i	2009-06-02 12:56:50 UTC (rev 9064)
@@ -156,10 +156,15 @@
 
     int whichShapes(rectObj rect)
     {
-        /* 
-        ** We assume folks use this like a simple query so retrieve all items with each shape.
-        */
-        if(msLayerWhichItems(self, MS_TRUE, MS_FALSE, NULL) != MS_SUCCESS) return MS_FAILURE;
+        int oldconnectiontype = self->connectiontype;
+        self->connectiontype = MS_INLINE;
+
+        if(msLayerWhichItems(self, MS_TRUE, MS_FALSE, NULL) != MS_SUCCESS) {
+            self->connectiontype = oldconnectiontype;
+            return MS_FAILURE;
+        }
+        self->connectiontype = oldconnectiontype;
+
         return msLayerWhichShapes(self, rect);
     }