diff options
| author | orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2010-12-21 23:48:05 +0000 |
|---|---|---|
| committer | orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2010-12-21 23:48:05 +0000 |
| commit | bf4ef1513eb7fd828fec7780fd0649f71876d025 (patch) | |
| tree | bbad59895754271533c8585bd969c8686c85e46f /htroot | |
| parent | 6b70393d1d4daab4db4cd67bcae863ce4befe039 (diff) | |
- 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
Diffstat (limited to 'htroot')
| -rw-r--r-- | htroot/PerformanceMemory_p.java | 3 | ||||
| -rw-r--r-- | htroot/Status.html | 3 | ||||
| -rw-r--r-- | htroot/yacysearch.html | 2 | ||||
| -rw-r--r-- | htroot/yacysearch_location.html | 4 | ||||
| -rw-r--r-- | htroot/yacysearchtrailer.html | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 49c01b95a..bb3c87ac7 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -102,7 +102,8 @@ public class PerformanceMemory_p { 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 index 91cfe8a56..57ce52e24 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -157,10 +157,11 @@ #(/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 index 65804f13b..2e6096293 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -115,7 +115,7 @@ $(function() { #(searchvideo)#::<input type="radio" id="video" name="contentdom" value="video" #(check)#::checked="checked"#(/check)# /><label for="video">Video</label> #(/searchvideo)# #(searchapp)#::<input type="radio" id="app" name="contentdom" value="app" #(check)#::checked="checked"#(/check)# /><label for="app">Applications</label>#(/searchapp)# - <a href="index.html?searchoptions=1&count=#[count]#&resource=#[resource]#&urlmaskfilter=#[urlmaskfilter]#&prefermaskfilter=#[prefermaskfilter]#&cat=#[cat]#&constraint=#[constraint]#&contentdom=#[contentdom]#&former=#[former]#&meanCount=#[meanCount]#">more options</a> + <a href="index.html?searchoptions=1&count=#[count]#&urlmaskfilter=#[urlmaskfilter]#&prefermaskfilter=#[prefermaskfilter]#&cat=#[cat]#&constraint=#[constraint]#&contentdom=#[contentdom]#&former=#[former]#&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 index fda7ec6b7..37532a3c1 100644 --- a/htroot/yacysearch_location.html +++ b/htroot/yacysearch_location.html @@ -25,7 +25,7 @@ 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"); @@ -33,7 +33,7 @@ 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 index 520fde89d..c85c90efc 100644 --- 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]#&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]#&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)# |