[mapserver-commits] r9911 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-03-03 12:32:37 -0500 (Wed, 03 Mar 2010)
New Revision: 9911

Modified:
   trunk/mapserver/mapogcfilter.c
Log:
Fix column type detecting for SLD filters #3052

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2010-03-03 17:13:44 UTC (rev 9910)
+++ trunk/mapserver/mapogcfilter.c	2010-03-03 17:32:37 UTC (rev 9911)
@@ -598,16 +598,12 @@
     }
 
     psLayer->resultcache = (resultCacheObj *)malloc(sizeof(resultCacheObj));
+    initResultCache(psLayer->resultcache);
 
-    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;
+    /*this will force the queries to retrive the shapes using
+     their unique id #3305*/
+    psLayer->resultcache->usegetshape = MS_TRUE;
 
-
     status = msLayerOpen(psLayer);
     if (status != MS_SUCCESS) 
       return;
@@ -627,7 +623,7 @@
     for (i=0; i<nSize; i++)
     {
         msInitShape(&shape);
-        status = msLayerResultsGetShape(psLayer, &shape, -1, anValues[i]);
+        status = msLayerGetShape(psLayer, &shape, -1, anValues[i]);
 
         if (status != MS_SUCCESS)
           nClassIndex = -1;