Permalink
Browse files

iconv feature attributes before applying filtering (#5215)

  • Loading branch information...
tbonfort committed Jan 5, 2016
1 parent f8ec673 commit 100e6af4f2d96ace9d331d054eea3deaf99e5f35
Showing with 8 additions and 5 deletions.
  1. +8 −5 maplayer.c
View
@@ -330,6 +330,14 @@ int msLayerNextShape(layerObj *layer, shapeObj *shape)
if(rv != MS_SUCCESS) return rv;
filter_passed = MS_TRUE; /* By default accept ANY shape */
/* attributes need to be iconv'd to UTF-8 before any filter logic is applied */
if(layer->encoding) {
rv = msLayerEncodeShapeAttributes(layer,shape);
if(rv != MS_SUCCESS)
return rv;
}
// if(layer->numitems > 0 && layer->iteminfo) {
filter_passed = msEvalExpression(layer, shape, &(layer->filter), layer->filteritemindex);
// }
@@ -344,11 +352,6 @@ int msLayerNextShape(layerObj *layer, shapeObj *shape)
return rv;
}
if(layer->encoding) {
rv = msLayerEncodeShapeAttributes(layer,shape);
if(rv != MS_SUCCESS)
return rv;
}
return rv;
}

0 comments on commit 100e6af

Please sign in to comment.