[mapserver-commits] r12030 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-08-08 22:28:34 -0700 (Mon, 08 Aug 2011)
New Revision: 12030

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapparser.c
   branches/branch-6-0/mapserver/mapparser.y
Log:
Fixed contains operator in logical expresions (#3974).

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-08-09 05:25:20 UTC (rev 12029)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-08-09 05:28:34 UTC (rev 12030)
@@ -14,6 +14,9 @@
 
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
+
+- Fixed contains operator in logical expresions (#3974)
+
 - Fix incorrect rendering of GD lines between 1 and 2 pixels wide (#3962)
 
 Version 6.0.1 (2011-07-12):

Modified: branches/branch-6-0/mapserver/mapparser.c
===================================================================
--- branches/branch-6-0/mapserver/mapparser.c	2011-08-09 05:25:20 UTC (rev 12029)
+++ branches/branch-6-0/mapserver/mapparser.c	2011-08-09 05:28:34 UTC (rev 12030)
@@ -1850,11 +1850,11 @@
 #line 475 "mapparser.y"
     {
       int rval;
-      rval = msGEOSWithin((yyvsp[-2].shpval), (yyvsp[0].shpval));
+      rval = msGEOSContains((yyvsp[-2].shpval), (yyvsp[0].shpval));
       if((yyvsp[-2].shpval)->scratch == MS_TRUE) msFreeShape((yyvsp[-2].shpval));
       if((yyvsp[0].shpval)->scratch == MS_TRUE) msFreeShape((yyvsp[0].shpval));
       if(rval == -1) {
-        yyerror(p, "Within operator failed.");
+        yyerror(p, "Contains operator failed.");
         return(-1);
       } else
         (yyval.intval) = rval;

Modified: branches/branch-6-0/mapserver/mapparser.y
===================================================================
--- branches/branch-6-0/mapserver/mapparser.y	2011-08-09 05:25:20 UTC (rev 12029)
+++ branches/branch-6-0/mapserver/mapparser.y	2011-08-09 05:28:34 UTC (rev 12030)
@@ -474,11 +474,11 @@
     }
   | shape_exp CONTAINS shape_exp {
       int rval;
-      rval = msGEOSWithin($1, $3);
+      rval = msGEOSContains($1, $3);
       if($1->scratch == MS_TRUE) msFreeShape($1);
       if($3->scratch == MS_TRUE) msFreeShape($3);
       if(rval == -1) {
-        yyerror(p, "Within operator failed.");
+        yyerror(p, "Contains operator failed.");
         return(-1);
       } else
         $$ = rval;