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

[svn at osgeo.org]

Author: dmorissette
Date: 2010-08-12 19:30:21 +0000 (Thu, 12 Aug 2010)
New Revision: 10456

Modified:
   sandbox/sdlime/common-expressions/mapserver/mapogcfilter.c
   sandbox/sdlime/common-expressions/mapserver/mapogcsld.c
Log:
Patched code to make it compile. FLTGetLogicalComparisonExpresssionObj() not in working condition. Assefa said he will revisit this. (see also #2950)

Modified: sandbox/sdlime/common-expressions/mapserver/mapogcfilter.c
===================================================================
--- sandbox/sdlime/common-expressions/mapserver/mapogcfilter.c	2010-08-11 12:01:58 UTC (rev 10455)
+++ sandbox/sdlime/common-expressions/mapserver/mapogcfilter.c	2010-08-12 19:30:21 UTC (rev 10456)
@@ -4079,12 +4079,12 @@
 /* -------------------------------------------------------------------- */
     if (psFilterNode->psLeftNode && psFilterNode->psRightNode)
     {
-        FLTFilterNodeToExpressionObj(psFilterNode->psLeftNode, lp, exp);
+        FLTFilterNodeToExpressionObj(psFilterNode->psLeftNode, lp /*, exp TODO: non working code, FIXME */);
         if (strcasecmp(psFilterNode->pszValue, "AND") == 0)
           expression->tokens[expression->numtokens++].token = MS_TOKEN_LOGICAL_AND;
         else
           expression->tokens[expression->numtokens++].token = MS_TOKEN_LOGICAL_OR;
-        FLTFilterNodeToExpressionObj(psFilterNode->psRightNode, lp, exp);
+        FLTFilterNodeToExpressionObj(psFilterNode->psRightNode, lp /*, exp TODO: non working code, FIXME */);
     }
 /* -------------------------------------------------------------------- */
 /*      NOT                                                             */

Modified: sandbox/sdlime/common-expressions/mapserver/mapogcsld.c
===================================================================
--- sandbox/sdlime/common-expressions/mapserver/mapogcsld.c	2010-08-11 12:01:58 UTC (rev 10455)
+++ sandbox/sdlime/common-expressions/mapserver/mapogcsld.c	2010-08-12 19:30:21 UTC (rev 10456)
@@ -29,6 +29,7 @@
 #include "mapogcsld.h"
 #include "mapogcfilter.h"
 #include "mapserver.h"
+#include "mapfile.h"
 
 #ifdef USE_OGR
 #include "cpl_string.h"