Changeset 355

Timestamp:

08/26/08 17:46:29 (4 months ago)

Author:

arneke

Message:

Making demo page work regardless of whether you're accessing demo or demo/

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/demo/Demo.java (modified) (9 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/demo/Demo.java

@@ -49 +49 @@
 
         } else {
-            page = generateHTML(tileLayerDispatcher);
+            if(request.getRequestURI().endsWith("demo/")) {
+                page = generateHTML(tileLayerDispatcher, true);
+            } else {
+                page = generateHTML(tileLayerDispatcher, false);
+            }
+            
         }
         response.setContentType("text/html");
@@ -60 +65 @@
     }
     
-    private static String generateHTML(TileLayerDispatcher tileLayerDispatcher) 
+    private static String generateHTML(TileLayerDispatcher tileLayerDispatcher, boolean trailingSlash) 
     throws GeoWebCacheException {
         String header = 
@@ -85 +90 @@
             +"</tr>\n";
         
-        String rows = tableRows(tileLayerDispatcher);
+        String rows = tableRows(tileLayerDispatcher, trailingSlash);
         
         String footer = "</table>\n</body></html>";
@@ -92 +97 @@
     }
     
-    private static String tableRows(TileLayerDispatcher tileLayerDispatcher)
+    private static String tableRows(TileLayerDispatcher tileLayerDispatcher, boolean trailingSlash)
     throws GeoWebCacheException {
         Iterator<Entry<String,TileLayer>> it = 
@@ -103 +108 @@
             buf.append("<tr><td>"+layer.getName()+"</td>");
             if(layer.supportsSRS(SRS.getEPSG4326())) {
-                buf.append("<td><a href=\"demo/"+layer.getName()+"?srs=EPSG:4326\">EPSG:4326</a></td>");
+                buf.append("<td>"+generateDemoUrl(layer.getName(), 4326,"EPSG:4326", trailingSlash)+"</td>");
             } else {
                 buf.append("<td>EPSG:4326 not supported</td>");
@@ -109 +114 @@
             
             if(layer.supportsSRS(SRS.getEPSG900913())) {
-                buf.append("<td><a href=\"demo/"+layer.getName()+"?srs=EPSG:900913\">EPSG:900913</a></td>");
+                buf.append("<td>"+generateDemoUrl(layer.getName(), 900913,"EPSG:900913", trailingSlash)+"</td>");
             } else {
                 buf.append("<td>EPSG:900913 not supported</td>");
@@ -115 +120 @@
             
             if(layer.supportsSRS(SRS.getEPSG4326())) {
-                buf.append("<td><a href=\"service/kml/"+layer.getName()+".png.kmz\">KML (PNG)</a></td>"
-                + "<td><a href=\"service/kml/"+layer.getName()+".kml.kmz\">KML (vector)</a></td>");
+                String prefix = "";
+                if(trailingSlash) {
+                    prefix = "../";
+                }
+                buf.append("<td><a href=\""+prefix+"service/kml/"+layer.getName()+".png.kmz\">KML (PNG)</a></td>"
+                + "<td><a href=\""+prefix+"service/kml/"+layer.getName()+".kml.kmz\">KML (vector)</a></td>");
             } else {
                 buf.append("<td colspan=\"2\"> Google Earth requires EPSG:4326 support</td>");
@@ -128 +137 @@
                 SRS curSRS = iter.next();
                 if(curSRS.getNumber() != 4326 && curSRS.getNumber() != 900913) { 
-                    buf.append("<a href=\"demo/"+layer.getName()+"?srs="+curSRS.toString()+"\">"
-                        + curSRS.toString()+"</a><br />");
+                    buf.append(generateDemoUrl(layer.getName(), curSRS.getNumber(),curSRS.toString(), trailingSlash)+"<br />");
                     count++;
                 }
@@ -140 +148 @@
         }
         return buf.toString();
+    }
+    
+    private static String generateDemoUrl(String layerName, int epsgNumber, String text, boolean trailingSlash) {
+        if(trailingSlash) {
+            return "<a href=\"./"+layerName+"?srs=EPSG:"+epsgNumber+"\">"+text+"</a>";
+        } else {
+            return "<a href=\"demo/"+layerName+"?srs=EPSG:"+epsgNumber+"\">"+text+"</a>";
+        }
     }