- fix for map view

- remove some UNRESOLVED PATTERN - maybe a fix for non-flushing cache git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7389 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Dec 21, 2010 · bf4ef15 · bf4ef15
1 parent 6b70393
commit bf4ef15
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java
@@ -102,7 +102,8 @@ public static serverObjects respond(final RequestHeader header, final serverObje
             map = Table.memoryStats(filename);
             prop.put("EcoList_" + c + "_tableIndexPath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p));
             prop.putNum("EcoList_" + c + "_tableSize", map.get("tableSize"));
-
+
+            assert map.get("tableKeyMem") != null : map;
             mem = Long.parseLong(map.get("tableKeyMem"));
             totalmem += mem;
             prop.put("EcoList_" + c + "_tableKeyMem", Formatter.bytesToString(mem));

diff --git a/htroot/Status.html b/htroot/Status.html
@@ -157,10 +157,11 @@ <h2><img src="/env/grafics/kaskelix.png" width="128" height="64" alt="YaCy Webse
     #(/hintCrawlMonitor)#
 
     <!-- Social Networking -->
-
+    <!--
     <dt class="hintIcon"><img src="env/grafics/idea.png" width="32" height="32" alt="idea"/></dt>
     <dd class="hint"><a href="http://twitter.com/yacy_search"><img src="/env/grafics/twitter_followme.png" alt="Follow YaCy on Twitter"/></a>
     </dd>
+    -->
 
     <!-- templates
     #(hint)#::

diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
@@ -115,7 +115,7 @@ <h2>#[promoteSearchPageGreeting]#</h2>
 	    #(searchvideo)#::<input type="radio" id="video" name="contentdom" value="video" #(check)#::checked="checked"#(/check)# /><label for="video">Video</label>&nbsp;&nbsp;#(/searchvideo)#
 	    #(searchapp)#::<input type="radio" id="app" name="contentdom" value="app" #(check)#::checked="checked"#(/check)# /><label for="app">Applications</label>#(/searchapp)#
         &nbsp;
-        <a href="index.html?searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#&amp;meanCount=#[meanCount]#">more options</a>
+        <a href="index.html?searchoptions=1&amp;count=#[count]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#&amp;meanCount=#[meanCount]#">more options</a>
     </div>
     #(/searchdomswitches)#
     <input type="hidden" name="former" value="#[former]#" />

diff --git a/htroot/yacysearch_location.html b/htroot/yacysearch_location.html
@@ -25,15 +25,15 @@
 					new OpenLayers.Control.Attribution()]
         });
 
-		layerMaplint = new OpenLayers.Layer.OSM.Maplint("Maplint");
+		//layerMaplint = new OpenLayers.Layer.OSM.Maplint("Maplint");
 		layerWMS = new OpenLayers.Layer.WMS( "OpenLayers WMS", "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
         layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
 		layerOsmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender");
 		layerCycleMap = new OpenLayers.Layer.OSM.CycleMap("CycleMap");
 		map.addLayer(layerMapnik);
 	    map.addLayer(layerOsmarender);
 		map.addLayer(layerCycleMap);
-		map.addLayer(layerMaplint);
+		//map.addLayer(layerMaplint);
 		map.addLayer(layerWMS);
         map.addControl(new OpenLayers.Control.LayerSwitcher());
         map.setCenter(new OpenLayers.LonLat(15,30) // Center of the map

diff --git a/htroot/yacysearchtrailer.html b/htroot/yacysearchtrailer.html
@@ -2,9 +2,9 @@
 
 #(cat-location)#::
 <div style="float: right; margin-top:5px; width: 220px;">
-<a href="yacysearch_location.html?query=#[queryenc]#&amp;display=#[display]#">
+<a href="yacysearch_location.html?query=#[queryenc]#">
 <img src="/env/grafics/earthsearch.png" width="215" height="159" alt="earthsearchlogo" /></a>
-<a href="yacysearch_location.html?query=#[queryenc]#&amp;display=#[display]#">Show search results for "#[query]#" on map</a>
+<a href="yacysearch_location.html?query=#[queryenc]#">Show search results for "#[query]#" on map</a>
 </div>
 #(/cat-location)#
 

diff --git a/source/net/yacy/kelondro/rwi/IndexCell.java b/source/net/yacy/kelondro/rwi/IndexCell.java
@@ -494,8 +494,9 @@ private void cleanCache() {
                 } catch (Exception e) {
                     // catch all exceptions to prevent that no semaphore is released
                     Log.logException(e);
+                } finally {
+                    this.dumperSemaphore.release();
                 }
-                this.dumperSemaphore.release();
             } catch (InterruptedException e) {
                 Log.logException(e);
             }
@@ -514,8 +515,9 @@ private void cleanCache() {
                 } catch (Exception e) {
                     // catch all exceptions to prevent that no semaphore is released
                     Log.logException(e);
+                } finally {
+                    this.cleanerSemaphore.release();
                 }
-                this.cleanerSemaphore.release();
             } catch (InterruptedException e) {
                 Log.logException(e);
             }