[mapserver-commits] r7189 - branches/branch-5-0/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2007-12-19 10:25:07 -0500 (Wed, 19 Dec 2007)
New Revision: 7189

Modified:
   branches/branch-5-0/mapserver/HISTORY.TXT
   branches/branch-5-0/mapserver/mapogcfilter.c
   branches/branch-5-0/mapserver/mapogcsld.c
Log:
SLD using single BBOX filter should generate an SQL ststement for oracle/postgis/ogr (#2450)

Modified: branches/branch-5-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-0/mapserver/HISTORY.TXT	2007-12-19 10:44:20 UTC (rev 7188)
+++ branches/branch-5-0/mapserver/HISTORY.TXT	2007-12-19 15:25:07 UTC (rev 7189)
@@ -12,6 +12,9 @@
 
 Current Version (SVN branch-5-0)
 --------------------------------
+- SLD using a single BBOX filter should generate an SQL ststement for 
+  oracle/postgis/ogr (#2450)
+
 - add missing space on dashed polygon outlines with svg (#2429) 
 
 - Restored behavior of MS 4.10 and made WMS STYLES parameter optional

Modified: branches/branch-5-0/mapserver/mapogcfilter.c
===================================================================
--- branches/branch-5-0/mapserver/mapogcfilter.c	2007-12-19 10:44:20 UTC (rev 7188)
+++ branches/branch-5-0/mapserver/mapogcfilter.c	2007-12-19 15:25:07 UTC (rev 7189)
@@ -927,7 +927,7 @@
         if (lp->connectiontype == MS_OGR)
           sprintf(pszBuffer, "WHERE %s", szExpression);
         else //POSTGIS OR ORACLE if (lp->connectiontype == MS_POSTGIS)
-          sprintf(pszBuffer, "%s", szExpression);
+          sprintf(pszBuffer, "(%s)", szExpression);
 
         msLoadExpressionString(&lp->filter, pszBuffer);
         free(szExpression);

Modified: branches/branch-5-0/mapserver/mapogcsld.c
===================================================================
--- branches/branch-5-0/mapserver/mapogcsld.c	2007-12-19 10:44:20 UTC (rev 7188)
+++ branches/branch-5-0/mapserver/mapogcsld.c	2007-12-19 15:25:07 UTC (rev 7189)
@@ -261,8 +261,9 @@
 
                         nLayerStatus =  GET_LAYER(map, i)->status;
                         GET_LAYER(map, i)->status = MS_ON;
-                        FLTApplySpatialFilterToLayer(psNode, map,  
-                                                     GET_LAYER(map, i)->index);
+                        FLTApplyFilterToLayer(psNode, map,
+                                              GET_LAYER(map, i)->index,
+                                              !FLTIsSimpleFilter(psNode));
                         GET_LAYER(map, i)->status = nLayerStatus;
                         FLTFreeFilterEncodingNode(psNode);