Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

- fix for map view

Browse Source 
- 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
This commit is contained in:
orbiter 2010-12-21 23:48:05 +00:00
parent 6b70393d1d
commit bf4ef1513e
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htroot/PerformanceMemory_p.java
View File

@ -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));

3
htroot/Status.html
View File

@ -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)#::

2
htroot/yacysearch.html
View File

@ -115,7 +115,7 @@ $(function() {
#(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]#" />

4
htroot/yacysearch_location.html
View File

@ -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

4
htroot/yacysearchtrailer.html
View File

@ -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)#

6
source/net/yacy/kelondro/rwi/IndexCell.java
View File

@ -494,8 +494,9 @@ public final class IndexCell<ReferenceType extends Reference> extends AbstractBu
} 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 @@ public final class IndexCell<ReferenceType extends Reference> extends AbstractBu
} 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);
}