Skip to content

Commit

Permalink
Formatting clean up...
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdlime
sdlime committed Feb 13, 2015
1 parent 8516f64 commit 006da75
Showing 1 changed file with 64 additions and 99 deletions.
163 changes: 64 additions & 99 deletions mapogcfiltercommon.c
View file
Expand Up @@ -51,9 +51,7 @@ char *FLTGetIsLikeComparisonCommonExpression(FilterEncodingNode *psFilterNode)


int nLength=0, i=0, iTmp=0; int nLength=0, i=0, iTmp=0;



if (!psFilterNode || !psFilterNode->pOther || !psFilterNode->psLeftNode || !psFilterNode->psRightNode || !psFilterNode->psRightNode->pszValue)
if (!psFilterNode || !psFilterNode->pOther || !psFilterNode->psLeftNode ||
!psFilterNode->psRightNode || !psFilterNode->psRightNode->pszValue)
return NULL; return NULL;


propIsLike = (FEPropertyIsLike *)psFilterNode->pOther; propIsLike = (FEPropertyIsLike *)psFilterNode->pOther;
Expand All @@ -62,12 +60,9 @@ char *FLTGetIsLikeComparisonCommonExpression(FilterEncodingNode *psFilterNode)
pszEscape = propIsLike->pszEscapeChar; pszEscape = propIsLike->pszEscapeChar;
bCaseInsensitive = propIsLike->bCaseInsensitive; bCaseInsensitive = propIsLike->bCaseInsensitive;


if (!pszWild || strlen(pszWild) == 0 || if (!pszWild || strlen(pszWild) == 0 || !pszSingle || strlen(pszSingle) == 0 || !pszEscape || strlen(pszEscape) == 0)
!pszSingle || strlen(pszSingle) == 0 ||
!pszEscape || strlen(pszEscape) == 0)
return NULL; return NULL;



/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Use operand with regular expressions. */ /* Use operand with regular expressions. */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
Expand All @@ -81,44 +76,37 @@ char *FLTGetIsLikeComparisonCommonExpression(FilterEncodingNode *psFilterNode)
strlcat(szBuffer, psFilterNode->psLeftNode->pszValue, bufferSize); strlcat(szBuffer, psFilterNode->psLeftNode->pszValue, bufferSize);
szBuffer[strlen(szBuffer)] = '\0'; szBuffer[strlen(szBuffer)] = '\0';


/*#3521 */ /* #3521 */
if(bCaseInsensitive == 1) if (bCaseInsensitive == 1)
sprintf(szTmp, "%s", "]\" ~* \""); sprintf(szTmp, "%s", "]\" ~* \"");
else else
sprintf(szTmp, "%s", "]\" ~ \""); sprintf(szTmp, "%s", "]\" ~ \"");
szTmp[7] = '\0'; szTmp[7] = '\0';
strlcat(szBuffer, szTmp, bufferSize); strlcat(szBuffer, szTmp, bufferSize);
szBuffer[strlen(szBuffer)] = '\0'; szBuffer[strlen(szBuffer)] = '\0';



pszValue = psFilterNode->psRightNode->pszValue; pszValue = psFilterNode->psRightNode->pszValue;
nLength = strlen(pszValue); nLength = strlen(pszValue);


iTmp =0; iTmp =0;
if (nLength > 0 && pszValue[0] != pszWild[0] && if (nLength > 0 && pszValue[0] != pszWild[0] && pszValue[0] != pszSingle[0] && pszValue[0] != pszEscape[0]) {
pszValue[0] != pszSingle[0] &&
pszValue[0] != pszEscape[0]) {
szTmp[iTmp]= '^'; szTmp[iTmp]= '^';
iTmp++; iTmp++;
} }
for (i=0; i<nLength; i++) { for (i=0; i<nLength; i++) {
if (pszValue[i] != pszWild[0] && if (pszValue[i] != pszWild[0] && pszValue[i] != pszSingle[0] && pszValue[i] != pszEscape[0]) {
pszValue[i] != pszSingle[0] &&
pszValue[i] != pszEscape[0]) {
szTmp[iTmp] = pszValue[i]; szTmp[iTmp] = pszValue[i];
iTmp++; iTmp++;
szTmp[iTmp] = '\0'; szTmp[iTmp] = '\0';
} else if (pszValue[i] == pszSingle[0]) { } else if (pszValue[i] == pszSingle[0]) {
szTmp[iTmp] = '.'; szTmp[iTmp] = '.';
iTmp++; iTmp++;
szTmp[iTmp] = '\0'; szTmp[iTmp] = '\0';
} else if (pszValue[i] == pszEscape[0]) { } else if (pszValue[i] == pszEscape[0]) {
szTmp[iTmp] = '\\'; szTmp[iTmp] = '\\';
iTmp++; iTmp++;
szTmp[iTmp] = '\0'; szTmp[iTmp] = '\0';
} else if (pszValue[i] == pszWild[0]) { } else if (pszValue[i] == pszWild[0]) {
/* strcat(szBuffer, "[0-9,a-z,A-Z,\\s]*"); */
/* iBuffer+=17; */
szTmp[iTmp++] = '.'; szTmp[iTmp++] = '.';
szTmp[iTmp++] = '*'; szTmp[iTmp++] = '*';
szTmp[iTmp] = '\0'; szTmp[iTmp] = '\0';
Expand All @@ -141,8 +129,7 @@ char *FLTGetIsBetweenComparisonCommonExpresssion(FilterEncodingNode *psFilterNod
int bString=0; int bString=0;
char *pszExpression=NULL, *pszTmpEscaped; char *pszExpression=NULL, *pszTmpEscaped;


if (!psFilterNode || if (!psFilterNode || !(strcasecmp(psFilterNode->pszValue, "PropertyIsBetween") == 0))
!(strcasecmp(psFilterNode->pszValue, "PropertyIsBetween") == 0))
return NULL; return NULL;


if (psFilterNode->psLeftNode == NULL || psFilterNode->psRightNode == NULL ) if (psFilterNode->psLeftNode == NULL || psFilterNode->psRightNode == NULL )
Expand All @@ -156,15 +143,15 @@ char *FLTGetIsBetweenComparisonCommonExpresssion(FilterEncodingNode *psFilterNod
msFreeCharArray(aszBounds, nBounds); msFreeCharArray(aszBounds, nBounds);
return NULL; return NULL;
} }

/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* check if the value is a numeric value or alphanumeric. If it */ /* check if the value is a numeric value or alphanumeric. If it */
/* is alphanumeric, add quotes around attribute and values. */ /* is alphanumeric, add quotes around attribute and values. */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
bString = 0; bString = 0;
if (aszBounds[0]) { if (aszBounds[0]) {
snprintf(szBuffer, bufferSize, "%s_type", psFilterNode->psLeftNode->pszValue); snprintf(szBuffer, bufferSize, "%s_type", psFilterNode->psLeftNode->pszValue);
if (msOWSLookupMetadata(&(lp->metadata), "OFG", szBuffer) != NULL && if (msOWSLookupMetadata(&(lp->metadata), "OFG", szBuffer) != NULL && (strcasecmp(msOWSLookupMetadata(&(lp->metadata), "OFG", szBuffer), "Character") == 0))
(strcasecmp(msOWSLookupMetadata(&(lp->metadata), "OFG", szBuffer), "Character") == 0))
bString = 1; bString = 1;
else if (FLTIsNumeric(aszBounds[0]) == MS_FALSE) else if (FLTIsNumeric(aszBounds[0]) == MS_FALSE)
bString = 1; bString = 1;
Expand All @@ -176,7 +163,6 @@ char *FLTGetIsBetweenComparisonCommonExpresssion(FilterEncodingNode *psFilterNod
} }
} }



/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* build expresssion. */ /* build expresssion. */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
Expand Down Expand Up @@ -238,7 +224,7 @@ char *FLTGetIsBetweenComparisonCommonExpresssion(FilterEncodingNode *psFilterNod
} }
pszTmpEscaped = msStringEscape(aszBounds[1]); pszTmpEscaped = msStringEscape(aszBounds[1]);
snprintf(szBuffer, bufferSize, "%s", pszTmpEscaped); snprintf(szBuffer, bufferSize, "%s", pszTmpEscaped);
if(pszTmpEscaped != aszBounds[1] ) msFree(pszTmpEscaped); if (pszTmpEscaped != aszBounds[1]) msFree(pszTmpEscaped);
pszExpression = msStringConcatenate(pszExpression, szBuffer); pszExpression = msStringConcatenate(pszExpression, szBuffer);


if (bString) { if (bString) {
Expand Down Expand Up @@ -269,21 +255,17 @@ char *FLTGetBinaryComparisonCommonExpression(FilterEncodingNode *psFilterNode, l
bString = 0; bString = 0;
if (psFilterNode->psRightNode->pszValue) { if (psFilterNode->psRightNode->pszValue) {
snprintf(szTmp, sizeof(szTmp), "%s_type", psFilterNode->psLeftNode->pszValue); snprintf(szTmp, sizeof(szTmp), "%s_type", psFilterNode->psLeftNode->pszValue);
if (msOWSLookupMetadata(&(lp->metadata), "OFG", szTmp) != NULL && if (msOWSLookupMetadata(&(lp->metadata), "OFG", szTmp) != NULL && (strcasecmp(msOWSLookupMetadata(&(lp->metadata), "OFG", szTmp), "Character") == 0))
(strcasecmp(msOWSLookupMetadata(&(lp->metadata), "OFG", szTmp), "Character") == 0))
bString = 1; bString = 1;
else if (FLTIsNumeric(psFilterNode->psRightNode->pszValue) == MS_FALSE) else if (FLTIsNumeric(psFilterNode->psRightNode->pszValue) == MS_FALSE)
bString = 1; bString = 1;
} }


/* specical case to be able to have empty strings in the expression. */ /* specical case to be able to have empty strings in the expression. */
/*propertyislike is always treated as string*/ /* propertyislike is always treated as string */
if (psFilterNode->psRightNode->pszValue == NULL || if (psFilterNode->psRightNode->pszValue == NULL || strcasecmp(psFilterNode->pszValue, "PropertyIsLike") == 0)
strcasecmp(psFilterNode->pszValue, "PropertyIsLike") == 0)
bString = 1; bString = 1;




/* attribute */ /* attribute */
if (bString) if (bString)
sprintf(szTmp, "%s", " (\"["); sprintf(szTmp, "%s", " (\"[");
Expand All @@ -298,32 +280,23 @@ char *FLTGetBinaryComparisonCommonExpression(FilterEncodingNode *psFilterNode, l
sprintf(szTmp, "%s", "] "); sprintf(szTmp, "%s", "] ");
pszExpression = msStringConcatenate(pszExpression, szTmp); pszExpression = msStringConcatenate(pszExpression, szTmp);


if (strcasecmp(psFilterNode->pszValue, if (strcasecmp(psFilterNode->pszValue, "PropertyIsEqualTo") == 0) {
"PropertyIsEqualTo") == 0) { /* case insensitive set ? */
/*case insensitive set ? */ if (psFilterNode->psRightNode->pOther && (*(int *)psFilterNode->psRightNode->pOther) == 1)
if (psFilterNode->psRightNode->pOther &&
(*(int *)psFilterNode->psRightNode->pOther) == 1) {
sprintf(szTmp, "%s", "=*"); sprintf(szTmp, "%s", "=*");
} else else
sprintf(szTmp, "%s", "="); sprintf(szTmp, "%s", "=");

} else if (strcasecmp(psFilterNode->pszValue, "PropertyIsNotEqualTo") == 0)
} else if (strcasecmp(psFilterNode->pszValue,
"PropertyIsNotEqualTo") == 0)
sprintf(szTmp, "%s", " != "); sprintf(szTmp, "%s", " != ");
else if (strcasecmp(psFilterNode->pszValue, else if (strcasecmp(psFilterNode->pszValue, "PropertyIsLessThan") == 0)
"PropertyIsLessThan") == 0)
sprintf(szTmp, "%s", " < "); sprintf(szTmp, "%s", " < ");
else if (strcasecmp(psFilterNode->pszValue, else if (strcasecmp(psFilterNode->pszValue, "PropertyIsGreaterThan") == 0)
"PropertyIsGreaterThan") == 0)
sprintf(szTmp, "%s", " > "); sprintf(szTmp, "%s", " > ");
else if (strcasecmp(psFilterNode->pszValue, else if (strcasecmp(psFilterNode->pszValue, "PropertyIsLessThanOrEqualTo") == 0)
"PropertyIsLessThanOrEqualTo") == 0)
sprintf(szTmp, "%s", " <= "); sprintf(szTmp, "%s", " <= ");
else if (strcasecmp(psFilterNode->pszValue, else if (strcasecmp(psFilterNode->pszValue, "PropertyIsGreaterThanOrEqualTo") == 0)
"PropertyIsGreaterThanOrEqualTo") == 0)
sprintf(szTmp, "%s", " >= "); sprintf(szTmp, "%s", " >= ");
else if (strcasecmp(psFilterNode->pszValue, else if (strcasecmp(psFilterNode->pszValue, "PropertyIsLike") == 0)
"PropertyIsLike") == 0)
sprintf(szTmp, "%s", " ~ "); sprintf(szTmp, "%s", " ~ ");


pszExpression = msStringConcatenate(pszExpression, szTmp); pszExpression = msStringConcatenate(pszExpression, szTmp);
Expand Down Expand Up @@ -351,8 +324,6 @@ char *FLTGetBinaryComparisonCommonExpression(FilterEncodingNode *psFilterNode, l
return pszExpression; return pszExpression;
} }




char *FLTGetLogicalComparisonCommonExpression(FilterEncodingNode *psFilterNode, layerObj *lp) char *FLTGetLogicalComparisonCommonExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
{ {
char *pszExpression = NULL; char *pszExpression = NULL;
Expand Down Expand Up @@ -382,7 +353,6 @@ char *FLTGetLogicalComparisonCommonExpression(FilterEncodingNode *psFilterNode,
pszExpression = msStringConcatenate(pszExpression, psFilterNode->pszValue); pszExpression = msStringConcatenate(pszExpression, psFilterNode->pszValue);
sprintf(szBuffer, "%s", " "); sprintf(szBuffer, "%s", " ");



pszTmp = FLTGetCommonExpression(psFilterNode->psRightNode, lp); pszTmp = FLTGetCommonExpression(psFilterNode->psRightNode, lp);
if (!pszTmp) { if (!pszTmp) {
msFree(pszExpression); msFree(pszExpression);
Expand All @@ -398,8 +368,7 @@ char *FLTGetLogicalComparisonCommonExpression(FilterEncodingNode *psFilterNode,
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* NOT */ /* NOT */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
else if (psFilterNode->psLeftNode && else if (psFilterNode->psLeftNode && strcasecmp(psFilterNode->pszValue, "NOT") == 0) {
strcasecmp(psFilterNode->pszValue, "NOT") == 0) {
pszTmp = FLTGetCommonExpression(psFilterNode->psLeftNode, lp); pszTmp = FLTGetCommonExpression(psFilterNode->psLeftNode, lp);
if (!pszTmp) if (!pszTmp)
return NULL; return NULL;
Expand All @@ -412,14 +381,11 @@ char *FLTGetLogicalComparisonCommonExpression(FilterEncodingNode *psFilterNode,


sprintf(szBuffer, "%s", ") "); sprintf(szBuffer, "%s", ") ");
pszExpression = msStringConcatenate(pszExpression, szBuffer); pszExpression = msStringConcatenate(pszExpression, szBuffer);

} }



return pszExpression; return pszExpression;
} }



char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerObj *lp) char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerObj *lp)
{ {
char *pszExpression = NULL; char *pszExpression = NULL;
Expand All @@ -442,7 +408,7 @@ char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerO
return NULL; return NULL;


/* get the shape */ /* get the shape */
if(FLTIsBBoxFilter(psNode)) { if (FLTIsBBoxFilter(psNode)) {
char szPolygon[512]; char szPolygon[512];
FLTGetBBOX(psNode, &sQueryRect); FLTGetBBOX(psNode, &sQueryRect);


Expand All @@ -456,38 +422,40 @@ char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerO


psTmpShape = msShapeFromWKT(szPolygon); psTmpShape = msShapeFromWKT(szPolygon);


/* This is a horrible hack to deal with world-extent requests and */ /*
/* reprojection. msProjectRect() detects if reprojection from longlat to */ ** This is a horrible hack to deal with world-extent requests and
/* projected SRS, and in that case it transforms the bbox to -1e-15,-1e-15,1e15,1e15 */ ** reprojection. msProjectRect() detects if reprojection from longlat to
/* to ensure that all features are returned */ ** projected SRS, and in that case it transforms the bbox to -1e-15,-1e-15,1e15,1e15
/* Make wfs_200_cite_filter_bbox_world.xml and wfs_200_cite_postgis_bbox_world.xml pass */ ** to ensure that all features are returned.
if( fabs(sQueryRect.minx - -180.0) < 1e-5 && **
** Make wfs_200_cite_filter_bbox_world.xml and wfs_200_cite_postgis_bbox_world.xml pass
*/
if (fabs(sQueryRect.minx - -180.0) < 1e-5 &&
fabs(sQueryRect.miny - -90.0) < 1e-5 && fabs(sQueryRect.miny - -90.0) < 1e-5 &&
fabs(sQueryRect.maxx - 180.0) < 1e-5 && fabs(sQueryRect.maxx - 180.0) < 1e-5 &&
fabs(sQueryRect.maxy - 90.0) < 1e-5 ) fabs(sQueryRect.maxy - 90.0) < 1e-5)
{ {
if(lp->projection.numargs > 0) { if (lp->projection.numargs > 0) {
if (psNode->pszSRS) if (psNode->pszSRS)
msInitProjection(&sProjTmp); msInitProjection(&sProjTmp);
if (psNode->pszSRS) { if (psNode->pszSRS) {
/* Use the non EPSG variant since axis swapping is done in FLTDoAxisSwappingIfNecessary */ /* Use the non EPSG variant since axis swapping is done in FLTDoAxisSwappingIfNecessary */
if (msLoadProjectionString(&sProjTmp, psNode->pszSRS) == 0) { if (msLoadProjectionString(&sProjTmp, psNode->pszSRS) == 0) {
msProjectRect(&sProjTmp, &lp->projection, &sQueryRect); msProjectRect(&sProjTmp, &lp->projection, &sQueryRect);
} }
} else if (lp->map->projection.numargs > 0) } else if (lp->map->projection.numargs > 0)
msProjectRect(&lp->map->projection, &lp->projection, &sQueryRect); msProjectRect(&lp->map->projection, &lp->projection, &sQueryRect);
if (psNode->pszSRS) if (psNode->pszSRS)
msFreeProjection(&sProjTmp); msFreeProjection(&sProjTmp);
} }
if( sQueryRect.minx <= -1e14 ) if (sQueryRect.minx <= -1e14) {
{ msFreeShape(psTmpShape);
msFreeShape(psTmpShape); msFree(psTmpShape);
msFree(psTmpShape); psTmpShape = (shapeObj*) msSmallMalloc(sizeof(shapeObj));
psTmpShape = (shapeObj*) msSmallMalloc(sizeof(shapeObj)); msInitShape(psTmpShape);
msInitShape(psTmpShape); msRectToPolygon(sQueryRect, psTmpShape);
msRectToPolygon(sQueryRect, psTmpShape); bAlreadyReprojected = 1;
bAlreadyReprojected = 1; }
}
} }


bBBoxQuery = 1; bBBoxQuery = 1;
Expand Down Expand Up @@ -517,7 +485,7 @@ char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerO
/* /*
** target is layer projection ** target is layer projection
*/ */
if(!bAlreadyReprojected && lp->projection.numargs > 0) { if (!bAlreadyReprojected && lp->projection.numargs > 0) {
if (psNode->pszSRS) if (psNode->pszSRS)
msInitProjection(&sProjTmp); msInitProjection(&sProjTmp);
if (psNode->pszSRS) { if (psNode->pszSRS) {
Expand Down Expand Up @@ -575,23 +543,22 @@ char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerO
/* /*
** Cleanup ** Cleanup
*/ */
if(bBBoxQuery) { if (bBBoxQuery) {
msFreeShape(psTmpShape); msFreeShape(psTmpShape);
msFree(psTmpShape); msFree(psTmpShape);
} }


return pszExpression; return pszExpression;
} }


char *FLTGetFeatureIdCommonExpression(FilterEncodingNode *psFilterNode, layerObj *lp) char *FLTGetFeatureIdCommonExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
{ {

char *pszExpression = NULL; char *pszExpression = NULL;
int nTokens = 0, i=0, bString=0; int nTokens = 0, i=0, bString=0;
char **tokens = NULL; char **tokens = NULL;
const char *pszAttribute=NULL; const char *pszAttribute=NULL;


#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR) #if defined(USE_WMS_SVR) || defined(USE_WFS_SVR) || defined(USE_WCS_SVR) || defined(USE_SOS_SVR)
if (psFilterNode->pszValue) { if (psFilterNode->pszValue) {
pszAttribute = msOWSLookupMetadata(&(lp->metadata), "OFG", "featureid"); pszAttribute = msOWSLookupMetadata(&(lp->metadata), "OFG", "featureid");
if (pszAttribute) { if (pszAttribute) {
Expand All @@ -610,7 +577,6 @@ char *FLTGetFeatureIdCommonExpression(FilterEncodingNode *psFilterNode, layerObj
bString = 1; bString = 1;
} }



if (bString) { if (bString) {
bufferSize = 11+strlen(pszId)+strlen(pszAttribute)+1; bufferSize = 11+strlen(pszId)+strlen(pszAttribute)+1;
pszTmp = (char *)msSmallMalloc(bufferSize); pszTmp = (char *)msSmallMalloc(bufferSize);
Expand All @@ -632,7 +598,8 @@ char *FLTGetFeatureIdCommonExpression(FilterEncodingNode *psFilterNode, layerObj
msFreeCharArray(tokens, nTokens); msFreeCharArray(tokens, nTokens);
} }
} }
/*opening and closing brackets are needed for mapserver expressions*/
/* opening and closing brackets are needed for mapserver expressions */
if (pszExpression) if (pszExpression)
pszExpression = msStringConcatenate(pszExpression, ")"); pszExpression = msStringConcatenate(pszExpression, ")");
} }
Expand All @@ -654,13 +621,12 @@ char* FLTGetTimeExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
return NULL; return NULL;


pszTimeValue = FLTGetDuring(psFilterNode, &pszTimeField); pszTimeValue = FLTGetDuring(psFilterNode, &pszTimeField);
if( pszTimeField && pszTimeValue ) if (pszTimeField && pszTimeValue) {
{
expressionObj old_filter; expressionObj old_filter;
msInitExpression(&old_filter); msInitExpression(&old_filter);
msCopyExpression(&old_filter, &lp->filter); /* save existing filter */ msCopyExpression(&old_filter, &lp->filter); /* save existing filter */
msFreeExpression(&lp->filter); msFreeExpression(&lp->filter);
if( msLayerSetTimeFilter(lp, pszTimeValue, pszTimeField) == MS_TRUE ) { if (msLayerSetTimeFilter(lp, pszTimeValue, pszTimeField) == MS_TRUE) {
pszExpression = msStrdup(lp->filter.string); pszExpression = msStrdup(lp->filter.string);
} }
msCopyExpression(&lp->filter, &old_filter); /* restore old filter */ msCopyExpression(&lp->filter, &old_filter); /* restore old filter */
Expand All @@ -669,7 +635,6 @@ char* FLTGetTimeExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
return pszExpression; return pszExpression;
} }



char *FLTGetCommonExpression(FilterEncodingNode *psFilterNode, layerObj *lp) char *FLTGetCommonExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
{ {
char *pszExpression = NULL; char *pszExpression = NULL;
Expand Down

0 comments on commit 006da75

Please sign in to comment.