[mapserver-commits] r9914 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-03-03 13:07:09 -0500 (Wed, 03 Mar 2010)
New Revision: 9914

Modified:
   trunk/mapserver/mapogcfilter.c
Log:
Revert back last commit 9911, It was done on the wrong file

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2010-03-03 17:55:28 UTC (rev 9913)
+++ trunk/mapserver/mapogcfilter.c	2010-03-03 18:07:09 UTC (rev 9914)
@@ -598,12 +598,16 @@
     }
 
     psLayer->resultcache = (resultCacheObj *)malloc(sizeof(resultCacheObj));
-    initResultCache(psLayer->resultcache);
 
-    /*this will force the queries to retrive the shapes using
-     their unique id #3305*/
-    psLayer->resultcache->usegetshape = MS_TRUE;
+    psLayer->resultcache->results = NULL;
+    psLayer->resultcache->numresults =  0;
+    psLayer->resultcache->cachesize = 0;
+    psLayer->resultcache->bounds.minx = -1;
+    psLayer->resultcache->bounds.miny = -1;
+    psLayer->resultcache->bounds.maxx = -1;
+    psLayer->resultcache->bounds.maxy = -1;
 
+
     status = msLayerOpen(psLayer);
     if (status != MS_SUCCESS) 
       return;
@@ -623,7 +627,7 @@
     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;