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

[svn at osgeo.org]

Author: sdlime
Date: 2010-08-25 03:23:21 +0000 (Wed, 25 Aug 2010)
New Revision: 10468

Modified:
   sandbox/sdlime/common-expressions/mapserver/maplayer.c
   sandbox/sdlime/common-expressions/mapserver/mapquery.c
   sandbox/sdlime/common-expressions/mapserver/mapserver.h
   sandbox/sdlime/common-expressions/mapserver/mapshape.c
Log:
msLayerSupportsCommonExpressions() -> msLayerSupportsCommonFilters().

Modified: sandbox/sdlime/common-expressions/mapserver/maplayer.c
===================================================================
--- sandbox/sdlime/common-expressions/mapserver/maplayer.c	2010-08-24 13:18:16 UTC (rev 10467)
+++ sandbox/sdlime/common-expressions/mapserver/maplayer.c	2010-08-25 03:23:21 UTC (rev 10468)
@@ -104,16 +104,16 @@
 }
 
 /*
-** Returns MS_TRUE is a layer supports the common expression syntax (RFC 59) and MS_FALSE otherwise.
+** Returns MS_TRUE is a layer supports the common expression/filter syntax (RFC 59) and MS_FALSE otherwise.
 */
-int msLayerSupportsCommonExpressions(layerObj *layer)
+int msLayerSupportsCommonFilters(layerObj *layer)
 {
   if ( ! layer->vtable) {
     int rv =  msInitializeVirtualTable(layer);
     if (rv != MS_SUCCESS)
       return rv;
   }
-  return layer->vtable->LayerSupportsCommonExpressions(layer);
+  return layer->vtable->LayerSupportsCommonFilters(layer);
 }
 
 /*
@@ -1098,7 +1098,7 @@
   return MS_FAILURE;
 }
 
-int LayerDefaultSupportsCommonExpressions(layerObj *layer)
+int LayerDefaultSupportsCommonFilters(layerObj *layer)
 {
   return MS_FALSE;
 }
@@ -1137,7 +1137,7 @@
 {
   assert(vtable != NULL);
 
-  vtable->LayerSupportsCommonExpressions = LayerDefaultSupportsCommonExpressions;
+  vtable->LayerSupportsCommonFilters = LayerDefaultSupportsCommonFilters;
   vtable->LayerInitItemInfo = LayerDefaultInitItemInfo;
   vtable->LayerFreeItemInfo = LayerDefaultFreeItemInfo;
   vtable->LayerOpen = LayerDefaultOpen;

Modified: sandbox/sdlime/common-expressions/mapserver/mapquery.c
===================================================================
--- sandbox/sdlime/common-expressions/mapserver/mapquery.c	2010-08-24 13:18:16 UTC (rev 10467)
+++ sandbox/sdlime/common-expressions/mapserver/mapquery.c	2010-08-25 03:23:21 UTC (rev 10468)
@@ -743,7 +743,7 @@
     }
 
     msCopyExpression(&old_filter, &lp->filter); /* save existing filter */
-    if(msLayerSupportsCommonExpressions(lp)) {
+    if(msLayerSupportsCommonFilters(lp)) {
       msCopyExpression(&lp->filter, map->query.filter); /* apply new filter */
     } else {
       freeExpression(&lp->filter); /* clear existing filter */
@@ -782,7 +782,7 @@
 
     while((status = msLayerNextShape(lp, &shape)) == MS_SUCCESS) { /* step through the shapes */
 
-      if(!msLayerSupportsCommonExpressions(lp)) { /* we have to apply the filter here instead of within the driver */
+      if(!msLayerSupportsCommonFilters(lp)) { /* we have to apply the filter here instead of within the driver */
         // TODO!
       }
 

Modified: sandbox/sdlime/common-expressions/mapserver/mapserver.h
===================================================================
--- sandbox/sdlime/common-expressions/mapserver/mapserver.h	2010-08-24 13:18:16 UTC (rev 10467)
+++ sandbox/sdlime/common-expressions/mapserver/mapserver.h	2010-08-25 03:23:21 UTC (rev 10468)
@@ -1579,7 +1579,7 @@
 /************************************************************************/
 #ifndef SWIG
 struct layerVTable {
-  int (*LayerSupportsCommonExpressions)(layerObj *layer);
+  int (*LayerSupportsCommonFilters)(layerObj *layer);
   int (*LayerInitItemInfo)(layerObj *layer);
   void (*LayerFreeItemInfo)(layerObj *layer);
   int (*LayerOpen)(layerObj *layer);
@@ -1998,7 +1998,7 @@
 MS_DLL_EXPORT int msLayerClearProcessing( layerObj *layer );
 MS_DLL_EXPORT char* msLayerGetFilterString( layerObj *layer );
 
-MS_DLL_EXPORT int msLayerSupportsCommanExpressions(layerObj *layer);
+MS_DLL_EXPORT int msLayerSupportsCommanFilters(layerObj *layer);
 MS_DLL_EXPORT int msTokenizeExpression(expressionObj *expression, char **list, int *listsize);
 
 MS_DLL_EXPORT int msLayerSetTimeFilter(layerObj *lp, const char *timestring, 

Modified: sandbox/sdlime/common-expressions/mapserver/mapshape.c
===================================================================
--- sandbox/sdlime/common-expressions/mapserver/mapshape.c	2010-08-24 13:18:16 UTC (rev 10467)
+++ sandbox/sdlime/common-expressions/mapserver/mapshape.c	2010-08-25 03:23:21 UTC (rev 10468)
@@ -2585,7 +2585,7 @@
   return MS_SUCCESS;
 }
 
-int msShapeFileLayerSupportsCommonExpressions(layerObj *layer)
+int msShapeFileLayerSupportsCommonFilters(layerObj *layer)
 {
   return MS_TRUE;
 }
@@ -2595,7 +2595,7 @@
   assert(layer != NULL);
   assert(layer->vtable != NULL);
 
-  layer->vtable->LayerSupportsCommonExpressions = msShapeFileLayerSupportsCommonExpressions;
+  layer->vtable->LayerSupportsCommonFilters = msShapeFileLayerSupportsCommonFilters;
   layer->vtable->LayerInitItemInfo = msShapeFileLayerInitItemInfo;
   layer->vtable->LayerFreeItemInfo = msShapeFileLayerFreeItemInfo;
   layer->vtable->LayerOpen = msShapeFileLayerOpen;