[mapserver-commits] r10446 - sandbox/sdlime/common-expressions/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-08-08 05:05:17 +0000 (Sun, 08 Aug 2010)
New Revision: 10446

Modified:
   sandbox/sdlime/common-expressions/mapserver/mapogr.cpp
Log:
Updated OGR driver to use new msEvalExpression() function signature.

Modified: sandbox/sdlime/common-expressions/mapserver/mapogr.cpp
===================================================================
--- sandbox/sdlime/common-expressions/mapserver/mapogr.cpp	2010-08-06 12:44:12 UTC (rev 10445)
+++ sandbox/sdlime/common-expressions/mapserver/mapogr.cpp	2010-08-08 05:05:17 UTC (rev 10446)
@@ -1777,8 +1777,7 @@
       // Check the expression unless it is a WHERE clause already 
       // handled by OGR. 
       if( (layer->filter.string && EQUALN(layer->filter.string,"WHERE ",6))
-          || msEvalExpression(&(layer->filter), layer->filteritemindex, 
-                              shape->values, layer->numitems) == MS_TRUE)
+          || msEvalExpression(layer, shape, &(layer->filter), layer->filteritemindex) == MS_TRUE)
       {
           // Feature matched filter expression... process geometry
           // shape->type will be set if geom is compatible with layer type