Changeset 418

Timestamp:

11/11/08 20:44:15 (2 months ago)

Author:

arneke

Message:

Decent code for truncating cache, one issue with bounding box translation remains...

Location:

trunk/geowebcache/src/main

Files:

• java/org/geowebcache/cache/Cache.java (modified) (2 diffs)
• java/org/geowebcache/cache/file/FileCache.java (modified) (2 diffs)
• java/org/geowebcache/cache/file/FilePathKey2.java (modified) (1 diff)
• java/org/geowebcache/rest/SeedResource.java (modified) (1 diff)
• java/org/geowebcache/rest/TruncateTask.java (modified) (1 diff)
• java/org/geowebcache/service/kml/KMLDebugGridLayer.java (modified) (2 diffs)
• resources/truncatetest.json (added)

trunk/geowebcache/src/main/java/org/geowebcache/cache/Cache.java

@@ -21 +21 @@
 
 import org.geowebcache.GeoWebCacheException;
+import org.geowebcache.layer.SRS;
+import org.geowebcache.layer.TileLayer;
+import org.geowebcache.mime.MimeType;
 import org.geowebcache.tile.Tile;
 import org.springframework.context.ApplicationContextAware;
@@ -67 +70 @@
     throws CacheException, GeoWebCacheException;
 
+    public void truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop, 
+            int[][] bounds, MimeType mimeType) throws CacheException;
+    
     public boolean remove(CacheKey keyProto, Tile tile) throws CacheException;
 

trunk/geowebcache/src/main/java/org/geowebcache/cache/file/FileCache.java

@@ -34 +34 @@
 import org.geowebcache.cache.Cache;
 import org.geowebcache.cache.CacheException;
+import org.geowebcache.cache.CacheFilter;
 import org.geowebcache.cache.CacheKey;
+import org.geowebcache.layer.SRS;
+import org.geowebcache.layer.TileLayer;
+import org.geowebcache.mime.MimeType;
 import org.geowebcache.tile.Tile;
 import org.geowebcache.util.GWCVars;
@@ -289 +293 @@
         context = (WebApplicationContext) arg0;
     }
+
+    public void truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop,
+            int[][] bounds, MimeType mimeType) throws CacheException {
+
+        String prefix = tl.getCachePrefix();
+
+        File layerPath = new File(prefix);
+
+        if (layerPath.exists() && layerPath.canWrite()) {
+            FilePathKey2Filter fpk2f = new FilePathKey2Filter(srs, zoomStart,
+                    zoomStop, bounds, mimeType);
+
+            File[] srsZoomDirs = layerPath.listFiles(fpk2f);
+
+            for (File srsZoom : srsZoomDirs) {
+                File[] intermediates = srsZoom.listFiles(fpk2f);
+
+                for (File imd : intermediates) {
+                    File[] tiles = imd.listFiles(fpk2f);
+
+                    for (File tile : tiles) {
+                        tile.delete();
+                    }
+
+                    String[] chk = imd.list();
+                    if (chk == null || chk.length == 0) {
+                        imd.delete();
+                    }
+                }
+
+                String[] chk = srsZoom.list();
+                if (chk == null || chk.length == 0) {
+                    srsZoom.delete();
+                }
+
+            }
+
+        } else {
+            throw new CacheException(prefix
+                    + " does not exist or is not writable.");
+        }
+
+    }
 }

trunk/geowebcache/src/main/java/org/geowebcache/cache/file/FilePathKey2.java

@@ -13 +13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
- * @author Arne Kepp, The Open Planning Project, Copyright 2007
+ * @author Arne Kepp, The Open Planning Project, Copyright 2008
  *  
  */

trunk/geowebcache/src/main/java/org/geowebcache/rest/SeedResource.java

@@ -212 +212 @@
         }
         if(type.equalsIgnoreCase("truncate")) {
-            return new TruncateTask();
+            return new TruncateTask(rq, tl);
         }
         

trunk/geowebcache/src/main/java/org/geowebcache/rest/TruncateTask.java

@@ -17 +17 @@
 package org.geowebcache.rest;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.geowebcache.GeoWebCacheException;
+import org.geowebcache.cache.Cache;
+import org.geowebcache.layer.TileLayer;
+import org.geowebcache.mime.MimeType;
+import org.geowebcache.util.wms.BBOX;
 
 public class TruncateTask extends GWCTask {
-
-    @Override
+    private static Log log = LogFactory.getLog(org.geowebcache.rest.TruncateTask.class);
+    
+    private final SeedRequest req;
+    
+    private final TileLayer tl;
+    
+    public TruncateTask(SeedRequest req, TileLayer tl) {
+        this.req = req;
+        this.tl = tl;
+    }
+    
     void doAction() throws GeoWebCacheException {
-        throw new GeoWebCacheException("Truncate isn't implemented yet! Sorry :( ");
+        
+        tl.isInitialized();
+        
+        Cache cache = tl.getCache();
+        
+        BBOX bbox = req.getBounds();
+        int[][] bounds = null;
+        
+        if(bbox != null) {
+            bounds = tl.getCoveredGridLevels(req.getSRS(), bbox);
+        }
+        
+        cache.truncate(tl, req.getSRS(), 
+                req.getZoomStart(), req.getZoomStop(), 
+                bounds, MimeType.createFromFormat(req.getMimeFormat()));
     }
 

trunk/geowebcache/src/main/java/org/geowebcache/service/kml/KMLDebugGridLayer.java

@@ -61 +61 @@
 
     }
-    
-    
-    
+
     private KMLDebugGridLayer() {
         super.grids = new Hashtable<SRS,Grid>();
@@ -388 +386 @@
     }
 
+
+    public void truncate(TileLayer tl, SRS srs, int zoomStart, int zoomStop,
+            int[][] bounds, MimeType mimeType) throws CacheException {
+        // TODO Auto-generated method stub
+        
+    }
+
 }