[mapserver-commits] r12381 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:21:02 -0700 (Fri, 26 Aug 2011)
New Revision: 12381

Modified:
   trunk/mapserver/mapcache/src/geocache_seed.c
Log:
dont fail on wms requests with grid srsalias

closes issue 84.
thomas.bonfort | 2011-06-07 18:38:34 +0200 (Tue, 07 Jun 2011)

Modified: trunk/mapserver/mapcache/src/geocache_seed.c
===================================================================
--- trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:20:58 UTC (rev 12380)
+++ trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:21:02 UTC (rev 12381)
@@ -579,15 +579,19 @@
     }
 
     if(old) {
-      struct tm oldtime;
-      memset(&oldtime,0,sizeof(oldtime));
-      char *ret = strptime(old,"%Y/%m/%d %H:%M",&oldtime);
-      if(!ret || *ret){
-         return usage(argv[0],"failed to parse time");
-      }
-      if(APR_SUCCESS != apr_time_ansi_put(&age_limit,mktime(&oldtime))) {
-         return usage(argv[0],"failed to convert time");
-      }
+       if(strcasecmp(old,"now")) {
+          struct tm oldtime;
+          memset(&oldtime,0,sizeof(oldtime));
+          char *ret = strptime(old,"%Y/%m/%d %H:%M",&oldtime);
+          if(!ret || *ret){
+             return usage(argv[0],"failed to parse time");
+          }
+          if(APR_SUCCESS != apr_time_ansi_put(&age_limit,mktime(&oldtime))) {
+             return usage(argv[0],"failed to convert time");
+          }
+       } else {
+         age_limit = apr_time_now();
+       }
     }
 
     geocache_context_seeding_init(&ctx,cfg,tileset,zooms[0],zooms[1],grid_link, dimensions);