[mapserver-commits] r9314 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-09-17 11:17:05 -0400 (Thu, 17 Sep 2009)
New Revision: 9314

Modified:
   trunk/mapserver/mapogcfilter.c
Log:
use msLayerResultsGetShape instead of msLayerGetShape #3069

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2009-09-16 18:29:25 UTC (rev 9313)
+++ trunk/mapserver/mapogcfilter.c	2009-09-17 15:17:05 UTC (rev 9314)
@@ -604,14 +604,11 @@
     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) 
     {
@@ -620,14 +617,15 @@
         if((psLayer->labelminscaledenom != -1) && (map->scaledenom < psLayer->labelminscaledenom)) 
           annotate = MS_FALSE;
     }
-    status = msLayerWhichItems(psLayer, MS_FALSE, NULL);
+    status = msLayerWhichItems(psLayer, MS_TRUE, NULL);
     if (status != MS_SUCCESS) 
       return;
 
     for (i=0; i<nSize; i++)
     {
         msInitShape(&shape);
-        status = msLayerGetShape(psLayer, &shape, -1, anValues[i]);
+        status = msLayerResultsGetShape(psLayer, &shape, -1, anValues[i]);
+
         if (status != MS_SUCCESS)
           nClassIndex = -1;
         else