Skip to content

Commit

Permalink
Fixed PostGIS translation for time-only date/time handling (fixes wms…
Browse files Browse the repository at this point in the history 
…_time_pattern_12_13_test_postgis.map tests).
  • Loading branch information
@sdlime
sdlime committed Sep 6, 2014
1 parent a44c9c7 commit e386d0b
Showing 1 changed file with 71 additions and 12 deletions.
83 changes: 71 additions & 12 deletions mappostgis.c
View file
Expand Up @@ -3625,6 +3625,18 @@ int msPostGISGetPaging(layerObj *layer)
#endif
}

/*
** Look ahead to find the next node of a specific type.
*/
tokenListNodeObjPtr findNextTokenByType(tokenListNodeObjPtr node, int type) {
while (node != NULL) {
if(node->token == type) return node;
node = node->next; /* keep looking */
}

return NULL; /* not found */
}

/*
** msPostGISLayerTranslateFilter()
**
Expand All @@ -3635,6 +3647,9 @@ int msPostGISLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
#ifdef USE_POSTGIS
tokenListNodeObjPtr node = NULL;

int resolution; /* date/time resolution */
int noDate;

char *snippet = NULL;
char *native_string = NULL;
char *strtmpl = NULL;
Expand All @@ -3644,7 +3659,7 @@ int msPostGISLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *

if(!filter->string) return MS_SUCCESS; /* not an error, just nothing to do */

// fprintf(stderr, "%s, %s, %d\n", filter->string, filteritem, filter->type);
// fprintf(stderr, "input: %s, %s, %d\n", filter->string, filteritem, filter->type);

if(filter->type == MS_STRING && filter->string && !filteritem) { /* native sql */
filter->native_string = msStrdup(filter->string);
Expand Down Expand Up @@ -3723,10 +3738,12 @@ int msPostGISLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
msFree(snippet);
msFree(stresc);
break;
case MS_TOKEN_LITERAL_TIME:
{
int resolution = msTimeGetResolution(node->tokensrc);

case MS_TOKEN_LITERAL_TIME: {
resolution = msTimeGetResolution(node->tokensrc);
noDate = MS_FALSE;

if(node->tokensrc[0] == 'T') noDate = MS_TRUE;

snippet = (char *) msSmallMalloc(128);
switch(resolution) {
case TIME_RESOLUTION_YEAR:
Expand All @@ -3742,16 +3759,31 @@ int msPostGISLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
sprintf(snippet, strtmpl, (node->tokenval.tmval.tm_year+1900), (node->tokenval.tmval.tm_mon+1), node->tokenval.tmval.tm_mday);
break;
case TIME_RESOLUTION_HOUR:
strtmpl = "to_timestamp('%d-%02d-%02d %02d','YYYY-MM-DD hh24')";
sprintf(snippet, strtmpl, (node->tokenval.tmval.tm_year+1900), (node->tokenval.tmval.tm_mon+1), node->tokenval.tmval.tm_mday, node->tokenval.tmval.tm_hour);
if(noDate) {
strtmpl = "to_timestamp('%02d','hh24')::time";
sprintf(snippet, strtmpl, node->tokenval.tmval.tm_hour);
} else {
strtmpl = "to_timestamp('%d-%02d-%02d %02d','YYYY-MM-DD hh24')";
sprintf(snippet, strtmpl, (node->tokenval.tmval.tm_year+1900), (node->tokenval.tmval.tm_mon+1), node->tokenval.tmval.tm_mday, node->tokenval.tmval.tm_hour);
}
break;
case TIME_RESOLUTION_MINUTE:
strtmpl = "to_timestamp('%d-%02d-%02d %02d:%02d','YYYY-MM-DD hh24:mi')";
sprintf(snippet, strtmpl, (node->tokenval.tmval.tm_year+1900), (node->tokenval.tmval.tm_mon+1), node->tokenval.tmval.tm_mday, node->tokenval.tmval.tm_hour, node->tokenval.tmval.tm_min);
if(noDate) {
strtmpl = "to_timestamp('%02d:%02d','hh24:mi')::time";
sprintf(snippet, strtmpl, node->tokenval.tmval.tm_hour, node->tokenval.tmval.tm_min);
} else {
strtmpl = "to_timestamp('%d-%02d-%02d %02d:%02d','YYYY-MM-DD hh24:mi')";
sprintf(snippet, strtmpl, (node->tokenval.tmval.tm_year+1900), (node->tokenval.tmval.tm_mon+1), node->tokenval.tmval.tm_mday, node->tokenval.tmval.tm_hour, node->tokenval.tmval.tm_min);
}
break;
case TIME_RESOLUTION_SECOND:
strtmpl = "to_timestamp('%d-%02d-%02d %02d:%02d:%02d','YYYY-MM-DD hh24:mi:ss')";
sprintf(snippet, strtmpl, (node->tokenval.tmval.tm_year+1900), (node->tokenval.tmval.tm_mon+1), node->tokenval.tmval.tm_mday, node->tokenval.tmval.tm_hour, node->tokenval.tmval.tm_min, node->tokenval.tmval.tm_sec);
if(noDate) {
strtmpl = "to_timestamp('%02d:%02d:%02d','hh24:mi:ss')::time";
sprintf(snippet, strtmpl, node->tokenval.tmval.tm_hour, node->tokenval.tmval.tm_min, node->tokenval.tmval.tm_sec);
} else {
strtmpl = "to_timestamp('%d-%02d-%02d %02d:%02d:%02d','YYYY-MM-DD hh24:mi:ss')";
sprintf(snippet, strtmpl, (node->tokenval.tmval.tm_year+1900), (node->tokenval.tmval.tm_mon+1), node->tokenval.tmval.tm_mday, node->tokenval.tmval.tm_hour, node->tokenval.tmval.tm_min, node->tokenval.tmval.tm_sec);
}
break;
}

Expand All @@ -3774,7 +3806,6 @@ int msPostGISLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
case MS_TOKEN_BINDING_DOUBLE:
case MS_TOKEN_BINDING_INTEGER:
case MS_TOKEN_BINDING_STRING:
case MS_TOKEN_BINDING_TIME:
if(node->next->token == MS_TOKEN_COMPARISON_RE || node->next->token == MS_TOKEN_COMPARISON_IRE)
strtmpl = "%s::text"; /* explicit cast necessary for certain operators */
else
Expand All @@ -3786,6 +3817,32 @@ int msPostGISLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
msFree(snippet);
msFree(stresc);
break;
case MS_TOKEN_BINDING_TIME: {
tokenListNodeObjPtr literalTimeNode = findNextTokenByType(node->next, MS_TOKEN_LITERAL_TIME);

if(literalTimeNode != NULL) {
resolution = msTimeGetResolution(literalTimeNode->tokensrc);
noDate = MS_FALSE;

if(literalTimeNode->tokensrc[0] == 'T') noDate = MS_TRUE;

if(resolution == TIME_RESOLUTION_HOUR || resolution == TIME_RESOLUTION_MINUTE || resolution == TIME_RESOLUTION_SECOND) {
if(noDate)
strtmpl = "%s::time";
else
strtmpl = "%s::timestamp";
} else
strtmpl = "%s::date";
stresc = msLayerEscapePropertyName(layer, node->tokenval.bindval.item);
snippet = (char *) msSmallMalloc(strlen(strtmpl) + strlen(stresc));
sprintf(snippet, strtmpl, stresc);
native_string = msStringConcatenate(native_string, snippet);
msFree(snippet);
msFree(stresc);
} // else handle as above

break;
}
case MS_TOKEN_BINDING_SHAPE:
native_string = msStringConcatenate(native_string, layerinfo->geomcolumn);
break;
Expand Down Expand Up @@ -3843,6 +3900,8 @@ int msPostGISLayerTranslateFilter(layerObj *layer, expressionObj *filter, char *
filter->native_string = msStrdup(native_string);
msFree(native_string);

// fprintf(stderr, "output: %s\n", filter->native_string);

return MS_SUCCESS;

cleanup:
Expand Down

0 comments on commit e386d0b

Please sign in to comment.