[mapserver-commits] r8628 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-03-03 00:24:17 -0500 (Tue, 03 Mar 2009)
New Revision: 8628

Modified:
   trunk/mapserver/mapwcs.c
Log:
Applied patch to deal with a couple of WCS issues (time ranges, #2487) and PostGIS tileindex-based time filters (#1856).

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2009-03-01 14:35:44 UTC (rev 8627)
+++ trunk/mapserver/mapwcs.c	2009-03-03 05:24:17 UTC (rev 8628)
@@ -38,6 +38,9 @@
 
 #include "mapwcs.h"
 
+#include "maptime.h"
+#include <time.h>
+
 #include "gdal.h"
 #include "cpl_string.h" /* GDAL string handling */
 
@@ -1484,7 +1487,9 @@
       return msWCSException(map, "InvalidParameterValue", "time", 
                             params->version );
     }
-    if(!strstr(value, params->time)) { /* this is likely too simple a test */
+    
+    /* check if timestamp is covered by the wcs_timeposition definition */
+    if (msValidateTimeValue(params->time, value) == MS_FALSE) {
       msSetError( MS_WCSERR, "The coverage does not have a time position of %s.", "msWCSGetCoverage()", params->time );
       return msWCSException(map, "InvalidParameterValue", "time",
                             params->version);
@@ -1518,7 +1523,7 @@
       
     /* finally set the filter */
     freeExpression(&tlp->filter);
-    msLoadExpressionString(&tlp->filter, params->time);
+    msLayerSetTimeFilter(tlp, params->time, value);
   }
            
   if( strncasecmp(params->version,"1.0",3) == 0 )