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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:15:54 -0700 (Fri, 26 Aug 2011)
New Revision: 12310

Modified:
   trunk/mapserver/mapcache/src/mod_geocache.c
Log:
add tile deletion for disk cache
dont report an error when setting a tile that already exists: silently overwrite it.
thomas.bonfort | 2011-02-14 12:57:51 +0100 (Mon, 14 Feb 2011)

Modified: trunk/mapserver/mapcache/src/mod_geocache.c
===================================================================
--- trunk/mapserver/mapcache/src/mod_geocache.c	2011-08-26 11:15:50 UTC (rev 12309)
+++ trunk/mapserver/mapcache/src/mod_geocache.c	2011-08-26 11:15:54 UTC (rev 12310)
@@ -263,6 +263,9 @@
       return geocache_write_capabilities(apache_ctx,req_caps);
    } else if( request->type == GEOCACHE_REQUEST_GET_TILE) {
       geocache_request_get_tile *req_tile = (geocache_request_get_tile*)request;
+      if( !req_tile->ntiles) {
+         return report_error(apache_ctx);
+      }
       geocache_tile *tile = geocache_core_get_tile(global_ctx,req_tile);
       if(GC_HAS_ERROR(global_ctx)) {
          return report_error(apache_ctx);
@@ -270,9 +273,6 @@
       ret = geocache_write_tile(apache_ctx,tile);
       return ret;
 
-      if( !req_tile->ntiles) {
-         return report_error(apache_ctx);
-      }
    } else if( request->type == GEOCACHE_REQUEST_GET_MAP) {
       geocache_request_get_map *req_map = (geocache_request_get_map*)request;
       geocache_map *map = geocache_core_get_map(global_ctx,req_map);