Changeset 370

Timestamp:

09/02/08 22:50:21 (3 months ago)

Author:

arneke

Message:

(Re)added functionality to force reseeding of existing tiles. Renamed getResponse to getTile.

Location:

trunk/geowebcache/src/main/java/org/geowebcache

Files:

• GeoWebCacheDispatcher.java (modified) (1 diff)
• layer/TileLayer.java (modified) (1 diff)
• layer/wms/WMSLayer.java (modified) (12 diffs)
• rest/SeedTask.java (modified) (2 diffs)
• service/kml/KMLDebugGridLayer.java (modified) (2 diffs)
• service/kml/KMLService.java (modified) (1 diff)
• service/kml/KMZHelper.java (modified) (1 diff)

trunk/geowebcache/src/main/java/org/geowebcache/GeoWebCacheDispatcher.java

@@ -257 +257 @@
             //tile.requestURI = request.getRequestURI();
             
-            // A5) Ask the layer to provide the tile
-            layer.getResponse(tile);
+            // A5) Ask the layer to provide the content for the tile
+            layer.getTile(tile);
 
             // A6) Write response

trunk/geowebcache/src/main/java/org/geowebcache/layer/TileLayer.java

@@ -179 +179 @@
      * @throws IOException
      */
-    public abstract Tile getResponse(Tile tile) throws GeoWebCacheException,
-            IOException;
-
+    public abstract Tile getTile(Tile tile) 
+    throws GeoWebCacheException, IOException;
+
+    public abstract void seedTile(Tile tile, boolean tryCache) 
+    throws GeoWebCacheException, IOException;
+    
     /**
      * This is a more direct way of requesting a tile without invoking

trunk/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSLayer.java

@@ -67 +67 @@
     private String errormime;
 
-    //private int width;
-
-    //private int height;
-
     private String version;
 
@@ -85 +81 @@
     private String vendorParameters;
 
-    //private boolean debugheaders;
-
-    //protected transient GridCalculator[] gridCalc;
-
-    //private transient int zoomStart;
-
-    //private transient int zoomStop;
-
-    //private transient String request;
-
-    //protected transient String[] wmsURL;
-
     private transient int curWmsURL;
 
-    //private transient String wmsLayers;
-
-    //private transient String wmsStyles;
-
-    //private transient WMSParameters wmsparams;
-
     private transient boolean saveExpirationHeaders;
 
@@ -134 +112 @@
 
     private static transient Log log;
-
-    //public WMSLayer(String layerName, CacheFactory cacheFactory)
-    //        throws GeoWebCacheException {
-    //    name = layerName;
-    //    initCacheFactory = cacheFactory;
-    //    log = LogFactory.getLog(org.geowebcache.layer.wms.WMSLayer.class);
-    //}
     
     public WMSLayer(String layerName, CacheFactory cacheFactory,
@@ -167 +138 @@
         //log = LogFactory.getLog(org.geowebcache.layer.wms.WMSLayer.class);
     }
-    
-//    private void lazyLayerInitialization() {
-//        width = 256;
-//        height = 256;
-//        version = "1.1.0";
-//        transparent = true;
-//        zoomStart = 0;
-//        zoomStop = 20;
-//        request = "GetMap";
-//        errormime = ErrorMime.vnd_ogc_se_inimage.getMimeType();
-//        curWmsURL = 0;
-//        wmsLayers = "topp:states";
-//        saveExpirationHeaders = false;
-//        expireClients = GWCVars.CACHE_USE_WMS_BACKEND_VALUE;
-//        expireCache = GWCVars.CACHE_NEVER_EXPIRE;
-//        layerLock = new ReentrantLock();
-//        layerLocked = false;
-//        layerLockedCond = layerLock.newCondition();
-//        procQueue = new HashMap<GridLocObj, Boolean>();
-//        cacheLockWait = -1;
-//        //initCacheFactory = cf;            
-//    }
 
     public Boolean isInitialized() {
@@ -204 +153 @@
 
     protected Boolean initialize() {
-        
-        //lazyLayerInitialization();
         log = LogFactory.getLog(org.geowebcache.layer.wms.WMSLayer.class);
         curWmsURL = 0;
@@ -214 +161 @@
         //width = 256;
         //height = 256;
-        
         //request = "GetMap";
+        
         errormime = ErrorMime.vnd_ogc_se_inimage.getMimeType();
         version = "1.1.0";
@@ -226 +173 @@
         procQueue = new HashMap<GridLocObj, Boolean>();
         
-        
         try {
             initParameters();
@@ -258 +204 @@
      * @return
      */
-    public Tile getResponse(Tile tile) throws GeoWebCacheException, IOException {
+    public Tile getTile(Tile tile) throws GeoWebCacheException, IOException {
         MimeType mime = tile.getMimeType();
 
@@ -278 +224 @@
         // Okay, so we need to go to the backend
         if (mime.supportsTiling()) {
-            return getMetatilingReponse(tile);
+            return getMetatilingReponse(tile, true);
         } else {
-            return getNonMetatilingReponse(tile);
-        }
-    }
+            return getNonMetatilingReponse(tile, true);
+        }
+    }
+    
+    
+    /**
+     * Used for seeding
+     */
+    public void seedTile(Tile tile, boolean tryCache) throws GeoWebCacheException, IOException {     
+        if (tile.getMimeType().supportsTiling()) {
+            getMetatilingReponse(tile, tryCache);
+        } else {
+            getNonMetatilingReponse(tile, tryCache);
+        }
+    }
+    
 
     /**
      * Metatiling request forwarding
      * 
-     * @param tileRequest
-     * @param gridLoc
-     * @param mime
-     * @param idx
-     * @param response
-     * @return
+     * @param tile the Tile with all the information
+     * @param tryCache whether to try the cache, or seed
      * @throws GeoWebCacheException
      */
-    private Tile getMetatilingReponse(Tile tile) throws GeoWebCacheException {
-
+    private Tile getMetatilingReponse(Tile tile, boolean tryCache) 
+    throws GeoWebCacheException {
         //int idx = this.getSRSIndex(tile.getSRS());
         int[] gridLoc = tile.getTileIndex();
@@ -318 +273 @@
         try {
             /** ****************** Check cache again ************** */
-            if (tryCacheFetch(tile)) {
+            if (tryCache && tryCacheFetch(tile)) {
                 // Someone got it already, return lock and we're done
                 removeFromQueue(metaGlo, condIdx);
@@ -370 +325 @@
      * Non-metatiling forward to backend
      * 
-     * @param tileRequest
-     * @param gridLoc
-     * @param mime
-     * @param idx
-     * @param response
-     * @return
-     */
-    private Tile getNonMetatilingReponse(Tile tile) throws GeoWebCacheException {
+     * @param tile the Tile with all the information
+     * @param tryCache whether to try the cache, or seed
+     * @throws GeoWebCacheException
+     */
+    private Tile getNonMetatilingReponse(Tile tile, boolean tryCache) 
+    throws GeoWebCacheException {
         // String debugHeadersStr = null;
         int[] gridLoc = tile.getTileIndex();
@@ -387 +340 @@
         try {
             /** ****************** Check cache again ************** */
-            if (tryCacheFetch(tile)) {
+            if (tryCache && tryCacheFetch(tile)) {
                 // Someone got it already, return lock and we're done
                 removeFromQueue(glo, condIdx);

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

@@ -78 +78 @@
             int TOTAL_TILES = tileCount(coveredGridLevels, zoomStart, zoomStop); 
             int count = 0;
+            boolean tryCache = !reseed;
             
             for (int level = zoomStart; level <= zoomStop; level++) {
@@ -90 +91 @@
                                 null, null);
                         try {
-                            tl.getResponse(tile);
+                            tl.seedTile(tile, tryCache);
                         } catch (GeoWebCacheException e) {
                             e.printStackTrace();

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

@@ -182 +182 @@
     }
 
-    public Tile getResponse(Tile tile)
+    public Tile getTile(Tile tile)
             throws GeoWebCacheException, IOException {
         // TODO Auto-generated method stub
@@ -516 +516 @@
     }
 
+    @Override
+    public void seedTile(Tile tile, boolean tryCache)
+            throws GeoWebCacheException, IOException {
+        // TODO Auto-generated method stub
+        
+    }
+
 }

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

@@ -348 +348 @@
             try {
                 tile.setWrapperMimeType(null);
-                tileLayer.getResponse(tile);
+                tileLayer.getTile(tile);
                 tile.setWrapperMimeType(XMLMime.kmz);
             } catch (IOException ioe) {

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

@@ -72 +72 @@
                 
                 try {                                        
-                    tileLayer.getResponse(tile);
+                    tileLayer.getTile(tile);
                     
                 } catch (IOException ioe) {