boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

added new news window into the status page. At this moment it is just a test.

Browse Source 
The news inside the window are about peer arrivals and departures, remote search accesses and crawls

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4739 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 17 years ago
parent bac38cfa18
commit 9935e83c86
10 changed files with 97 additions and 60 deletions
Show Stats Download Patch File Download Diff File

6
htroot/Status.html
Unescape View File

@ -3,7 +3,6 @@
<head> <head>
<title>YaCy '#[clientname]#': Console Status</title> <title>YaCy '#[clientname]#': Console Status</title>
#%env/templates/metas.template%# #%env/templates/metas.template%#
<meta http-equiv="REFRESH" content="30" />
</head> </head>
<body style="margin:0px;"> <body style="margin:0px;">
#%env/templates/header.template%# #%env/templates/header.template%#
@ -24,7 +23,10 @@
<div class="welcome"> <div class="welcome">
<center> <center>
<h2>Welcome to YaCy!</h2><br/> <h2>Welcome to YaCy!</h2><br />
<iframe src="rssTerminal.html?set=PEERNEWS&width=468px&height=200px&maxlines=20&maxwidth=90"
width="482" height="220" scrolling="no" name="newsframe"
marginheight="0" marginwidth="0" frameborder="0"></iframe><br />
<img src="Banner.png?textcolor=000000&amp;bgcolor=ddeeee&amp;bordercolor=aaaaaa" alt="banner" /> <img src="Banner.png?textcolor=000000&amp;bgcolor=ddeeee&amp;bordercolor=aaaaaa" alt="banner" />
</center> </center>

18
htroot/js/query.js
Unescape View File

@ -0,0 +1,18 @@
var query = new Object();
function getQueryProps() {
var text = "";
for (property in query) {
text += property + " = " + query[property] + ";\n";
}
return text;
}
function getURLparameters() {
if (self.location.search.indexOf("=") == -1) {return;}
var parameterArray = unescape(self.location.search).substring(1).split("&");
for (var i=0;i<parameterArray.length;i++) {
parameterArray[i] = parameterArray[i].split("=");
eval("query." + parameterArray[i][0] + " = \"" + parameterArray[i][1] + "\"");
}
}

81
htroot/rssTerminal.html
Unescape View File

@ -5,52 +5,41 @@
<title>rss terminal</title> <title>rss terminal</title>
<style type="text/css"> <style type="text/css">
div#container { div#feedbox {
padding:6px; padding-left: 6px;
background:#fff; padding-top: 6px;
border:1px solid #000; background: #fff;
width: 600px; border:1px solid #888;
height: 360px;
margin:0 auto; margin:0 auto;
text-align:left; text-align:left;
font:9px 'Lucida Console', 'Courier New', monospace;
} }
div#container p { div#feedbox p {
margin:0px 0; margin:0px 0;
} }
div#scrollObject {
position: absolute;
overflow: hidden;
width: 600px;
height: 360px;
}
div#content {
position:absolute;
font:9px 'Lucida Console', 'Courier New', monospace;
top:0;
left:0;
}
</style> </style>
<script type="text/javascript" src="/js/ajax.js"></script> <script type="text/javascript" src="/js/ajax.js"></script>
<script type="text/javascript" src="/js/rss2.js"></script> <script type="text/javascript" src="/js/rss2.js"></script>
<script type="text/javascript" src="/js/query.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var lines = new Array(); var lines = new Array();
var maxlines = 360 / 9; var maxlines = 20;
var maxwidth = 600 / 5; var maxwidth = 90;
var maxtime = 30000; // time that should be wasted until everything is scrolled var maxtime = 10000; // time that should be wasted until everything is scrolled
var minwait = 50; // if this is too short, the CPU will eat all performance var minwait = 50; // if this is too short, the CPU will eat all performance
var maxwait = 500; var maxwait = 500;
var scroller = null; var scroller = null;
var idleping = null; var idleping = null;
var loader = null;
var lastwait = 1000; var lastwait = 1000;
var tab = "&nbsp;&nbsp;"; var tab = "&nbsp;&nbsp;";
function fillLines() { function fillLines() {
for (var i = 0; i < maxlines; i++) { for (var i = 0; i < maxlines + 1; i++) {
//addLine(i + "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
addLine(""); addLine("");
} }
} }
@ -130,22 +119,36 @@ function idlepingExec() {
} }
} }
</script> function loaderInit() {
loader=window.setInterval("load()", 8000);
load();
}
</head> function load() {
<body> getRSS("http://localhost:8080/xml/feed.rss?set=PEERNEWS");
<div id="container"> }
<div id="scrollObject">
<div id="content"></div> function windowsizing() {
</div> if (query.maxlines) maxlines = query.maxlines;
</div> if (query.maxwidth) maxwidth = query.maxwidth;
</body> if (query.maxtime) maxtime = query.maxtime;
if (query.minwait) minwait = query.minwait;
if (query.maxwait) maxwait = query.maxwait;
if (query.width) {
document.getElementById("feedbox").style.width = query.width;
}
if (query.height) {
document.getElementById("feedbox").style.height = query.height;
}
}
<script type="text/javascript">
fillLines();
idlepingInit();
getRSS("http://localhost:8080/yacysearch.rss?search=java&count=100");
//getRSS("http://news.google.com/news?output=rss");
</script> </script>
</head>
<body onload="self.getURLparameters();windowsizing();fillLines();idlepingInit();loaderInit();">
<div id="feedbox">
<p id="content"></p>
</div>
</body>
</html> </html>

2
htroot/xml/feed.java
Unescape View File

@ -47,7 +47,7 @@ public class feed {
if ((post == null) || (env == null)) return prop; if ((post == null) || (env == null)) return prop;
//boolean authorized = sb.adminAuthenticated(header) >= 2; //boolean authorized = sb.adminAuthenticated(header) >= 2;
String channelName = post.get("channel"); String channelName = post.get("set");
if (channelName == null) return prop; if (channelName == null) return prop;
RSSFeed feed = RSSFeed.channels(channelName); RSSFeed feed = RSSFeed.channels(channelName);

6
htroot/yacy/search.java
Unescape View File

@ -51,6 +51,8 @@ import de.anomic.server.serverObjects;
import de.anomic.server.serverProfiling; import de.anomic.server.serverProfiling;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
import de.anomic.tools.crypt; import de.anomic.tools.crypt;
import de.anomic.xml.RSSFeed;
import de.anomic.xml.RSSMessage;
import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacyCore;
import de.anomic.yacy.yacyNetwork; import de.anomic.yacy.yacyNetwork;
import de.anomic.yacy.yacySeed; import de.anomic.yacy.yacySeed;
@ -125,10 +127,11 @@ public final class search {
TreeSet<String> abstractSet = ((abstracts.length() == 0) || (abstracts.equals("auto"))) ? null : plasmaSearchQuery.hashes2Set(abstracts); TreeSet<String> abstractSet = ((abstracts.length() == 0) || (abstracts.equals("auto"))) ? null : plasmaSearchQuery.hashes2Set(abstracts);
// store accessing peer // store accessing peer
yacySeed remoteSeed = yacySeed.genRemoteSeed(oseed, key, true);
if (yacyCore.seedDB == null) { if (yacyCore.seedDB == null) {
yacyCore.log.logSevere("yacy.search: seed cache not initialized"); yacyCore.log.logSevere("yacy.search: seed cache not initialized");
} else { } else {
yacyCore.peerActions.peerArrival(yacySeed.genRemoteSeed(oseed, key, true), true); yacyCore.peerActions.peerArrival(remoteSeed, true);
} }
// prepare search // prepare search
@ -177,6 +180,7 @@ public final class search {
theQuery = new plasmaSearchQuery(null, queryhashes, excludehashes, rankingProfile, maxdist, prefer, plasmaSearchQuery.contentdomParser(contentdom), false, count, 0, filter, plasmaSearchQuery.SEARCHDOM_LOCAL, null, -1, constraint, false, yacyURL.TLD_any_zone_filter, client); theQuery = new plasmaSearchQuery(null, queryhashes, excludehashes, rankingProfile, maxdist, prefer, plasmaSearchQuery.contentdomParser(contentdom), false, count, 0, filter, plasmaSearchQuery.SEARCHDOM_LOCAL, null, -1, constraint, false, yacyURL.TLD_any_zone_filter, client);
theQuery.domType = plasmaSearchQuery.SEARCHDOM_LOCAL; theQuery.domType = plasmaSearchQuery.SEARCHDOM_LOCAL;
yacyCore.log.logInfo("INIT HASH SEARCH (query-" + abstracts + "): " + plasmaSearchQuery.anonymizedQueryHashes(theQuery.queryHashes) + " - " + theQuery.displayResults() + " links"); yacyCore.log.logInfo("INIT HASH SEARCH (query-" + abstracts + "): " + plasmaSearchQuery.anonymizedQueryHashes(theQuery.queryHashes) + " - " + theQuery.displayResults() + " links");
RSSFeed.channels("PEERNEWS").addMessage(new RSSMessage("Remote Search Request from " + remoteSeed.getName(), plasmaSearchQuery.anonymizedQueryHashes(theQuery.queryHashes)));
// make event // make event
theSearch = plasmaSearchEvent.getEvent(theQuery, rankingProfile, sb.wordIndex, sb.crawlResults, null, true); theSearch = plasmaSearchEvent.getEvent(theQuery, rankingProfile, sb.wordIndex, sb.crawlResults, null, true);

4
source/de/anomic/plasma/plasmaSearchEvent.java
Unescape View File

@ -218,7 +218,7 @@ public final class plasmaSearchEvent {
if (url == null) continue; if (url == null) continue;
//System.out.println("***DEBUG*** SEARCH RESULT URL=" + url.toNormalform(false, false)); //System.out.println("***DEBUG*** SEARCH RESULT URL=" + url.toNormalform(false, false));
resultEntry = obtainResultEntry(uentry, (snippetComputationAllTime < 300) ? 1 : 0); resultEntry = obtainResultEntry(uentry, (snippetComputationAllTime < 100) ? 1 : 0);
if (resultEntry == null) continue; // the entry had some problems, cannot be used if (resultEntry == null) continue; // the entry had some problems, cannot be used
urlRetrievalAllTime += resultEntry.dbRetrievalTime; urlRetrievalAllTime += resultEntry.dbRetrievalTime;
snippetComputationAllTime += resultEntry.snippetComputationTime; snippetComputationAllTime += resultEntry.snippetComputationTime;
@ -350,7 +350,7 @@ public final class plasmaSearchEvent {
if (query.contentdom == plasmaSearchQuery.CONTENTDOM_TEXT) { if (query.contentdom == plasmaSearchQuery.CONTENTDOM_TEXT) {
// attach text snippet // attach text snippet
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
plasmaSnippetCache.TextSnippet snippet = plasmaSnippetCache.retrieveTextSnippet(comp, snippetFetchWordHashes, (snippetFetchMode == 2), ((query.constraint != null) && (query.constraint.get(plasmaCondenser.flag_cat_indexof))), 180, 3000, (snippetFetchMode == 2) ? Integer.MAX_VALUE : 100000, query.isGlobal()); plasmaSnippetCache.TextSnippet snippet = plasmaSnippetCache.retrieveTextSnippet(comp, snippetFetchWordHashes, (snippetFetchMode == 2), ((query.constraint != null) && (query.constraint.get(plasmaCondenser.flag_cat_indexof))), 180, 3000, (snippetFetchMode == 2) ? Integer.MAX_VALUE : 30000, query.isGlobal());
long snippetComputationTime = System.currentTimeMillis() - startTime; long snippetComputationTime = System.currentTimeMillis() - startTime;
serverLog.logInfo("SEARCH_EVENT", "text snippet load time for " + comp.url() + ": " + snippetComputationTime + ", " + ((snippet.getErrorCode() < 11) ? "snippet found" : ("no snippet found (" + snippet.getError() + ")"))); serverLog.logInfo("SEARCH_EVENT", "text snippet load time for " + comp.url() + ": " + snippetComputationTime + ", " + ((snippet.getErrorCode() < 11) ? "snippet found" : ("no snippet found (" + snippet.getError() + ")")));

3
source/de/anomic/plasma/plasmaWordIndex.java
Unescape View File

@ -59,6 +59,8 @@ import de.anomic.kelondro.kelondroRotateIterator;
import de.anomic.kelondro.kelondroRowSet; import de.anomic.kelondro.kelondroRowSet;
import de.anomic.server.serverMemory; import de.anomic.server.serverMemory;
import de.anomic.server.logging.serverLog; import de.anomic.server.logging.serverLog;
import de.anomic.xml.RSSFeed;
import de.anomic.xml.RSSMessage;
import de.anomic.yacy.yacyDHTAction; import de.anomic.yacy.yacyDHTAction;
import de.anomic.yacy.yacySeedDB; import de.anomic.yacy.yacySeedDB;
import de.anomic.yacy.yacyURL; import de.anomic.yacy.yacyURL;
@ -663,6 +665,7 @@ public final class plasmaWordIndex implements indexRI {
"Anchors: " + ((document.getAnchors() == null) ? 0 : document.getAnchors().size()) + "Anchors: " + ((document.getAnchors() == null) ? 0 : document.getAnchors().size()) +
"\n\tLinkStorageTime: " + (storageEndTime - startTime) + " ms | " + "\n\tLinkStorageTime: " + (storageEndTime - startTime) + " ms | " +
"indexStorageTime: " + (indexingEndTime - storageEndTime) + " ms"); "indexStorageTime: " + (indexingEndTime - storageEndTime) + " ms");
RSSFeed.channels("PEERNEWS").addMessage(new RSSMessage("Indexed web page", entry.url().toNormalform(true, false)));
} }
// finished // finished

9
source/de/anomic/server/serverCore.java
Unescape View File

@ -63,6 +63,7 @@ import java.net.Socket;
import java.net.SocketException; import java.net.SocketException;
import java.nio.channels.ClosedByInterruptException; import java.nio.channels.ClosedByInterruptException;
import java.security.KeyStore; import java.security.KeyStore;
import java.util.ConcurrentModificationException;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -481,7 +482,13 @@ public final class serverCore extends serverAbstractBusyThread implements server
// shut down all busySessions // shut down all busySessions
if (this.busySessions != null) for (Session session: this.busySessions) { if (this.busySessions != null) for (Session session: this.busySessions) {
try {session.interrupt();} catch (SecurityException e ) {e.printStackTrace();} try {
session.interrupt();
} catch (SecurityException e ) {
e.printStackTrace();
} catch (ConcurrentModificationException e) {
e.printStackTrace();
}
} }
// closing the port forwarding channel // closing the port forwarding channel

3
source/de/anomic/yacy/yacyNewsPool.java
Unescape View File

@ -340,6 +340,9 @@ public class yacyNewsPool {
// double-check with old news // double-check with old news
if (newsDB.get(record.id()) != null) return; if (newsDB.get(record.id()) != null) return;
incomingNews.push(record); incomingNews.push(record);
// add message to feed channel
//RSSFeed.channels("PEERNEWS").addMessage(new RSSMessage("Incoming News: " + record.category() + " from " + record.originator(), record.attributes().toString()));
} }
public int size(int dbKey) { public int size(int dbKey) {

23
source/de/anomic/yacy/yacyVersion.java
Unescape View File

@ -37,7 +37,6 @@ import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -511,7 +510,7 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
String[] downloaded = filesPath.list(); String[] downloaded = filesPath.list();
// parse all filenames and put them in a sorted set // parse all filenames and put them in a sorted set
SortedSet<yacyVersion> downloadedreleases = new TreeSet<yacyVersion>(); TreeSet<yacyVersion> downloadedreleases = new TreeSet<yacyVersion>();
for (int j = 0; j < downloaded.length; j++) { for (int j = 0; j < downloaded.length; j++) {
try { try {
release = new yacyVersion(downloaded[j]); release = new yacyVersion(downloaded[j]);
@ -534,20 +533,18 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
// remove old files // remove old files
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
final long deleteAfterMillis = deleteAfterDays * 24 * 60 * 60000l; final long deleteAfterMillis = deleteAfterDays * 24 * 60 * 60000l;
String lastMain = null; final Iterator<yacyVersion> iter = downloadedreleases.iterator();
String filename; while (iter.hasNext()) {
for (final yacyVersion aRelease: downloadedreleases) { release = iter.next();
filename = aRelease.name;
if(keepMain && aRelease.mainRelease) { if(keepMain && release.mainRelease) {
// keep this one, delete last remembered main release file // we found the latest main release
if(lastMain != null) { keepMain = false;
filename = lastMain; continue;
}
lastMain = aRelease.name;
} }
// check file age // check file age
File downloadedFile = new File(filesPath + File.separator + filename); File downloadedFile = new File(filesPath + File.separator + release.name);
if(now - downloadedFile.lastModified() > deleteAfterMillis) { if(now - downloadedFile.lastModified() > deleteAfterMillis) {
// delete file // delete file
if(!downloadedFile.delete()) { if(!downloadedFile.delete()) {

Write Preview
Loading…
Cancel
Save