Fix cluster filter propagation to the source layer (#5364)

szekerest · szekerest · commit 7dc87fe67193 · 2017-01-05T11:53:56.000+01:00
diff --git a/mapcluster.c b/mapcluster.c
@@ -1511,7 +1511,10 @@ int msClusterLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
     return MS_FAILURE;
   }
 
-  return layerinfo->srcLayer.vtable->LayerTranslateFilter(&layerinfo->srcLayer, filter, filteritem);
+  if (layerinfo->srcLayer.filter.type == MS_EXPRESSION && layerinfo->srcLayer.filter.tokens == NULL)
+    msTokenizeExpression(&(layerinfo->srcLayer.filter), layer->items, &(layer->numitems));
+
+  return layerinfo->srcLayer.vtable->LayerTranslateFilter(&layerinfo->srcLayer, &layerinfo->srcLayer.filter, filteritem);
 }
 
 char* msClusterLayerEscapeSQLParam(layerObj *layer, const char* pszString)

Original file line number	Diff line number	Diff line change
`@@ -1511,7 +1511,10 @@ int msClusterLayerTranslateFilter(layerObj layer, expressionObj filter, char *`
`1511`	`1511`	`return MS_FAILURE;`
`1512`	`1512`	`}`
`1513`	`1513`
`1514`		`- return layerinfo->srcLayer.vtable->LayerTranslateFilter(&layerinfo->srcLayer, filter, filteritem);`
	`1514`	`+ if (layerinfo->srcLayer.filter.type == MS_EXPRESSION && layerinfo->srcLayer.filter.tokens == NULL)`
	`1515`	`+ msTokenizeExpression(&(layerinfo->srcLayer.filter), layer->items, &(layer->numitems));`
	`1516`	`+`
	`1517`	`+ return layerinfo->srcLayer.vtable->LayerTranslateFilter(&layerinfo->srcLayer, &layerinfo->srcLayer.filter, filteritem);`
`1515`	`1518`	`}`
`1516`	`1519`
`1517`	`1520`	`char* msClusterLayerEscapeSQLParam(layerObj layer, const char pszString)`