From ec07928807f44f307962e47cbffef9406260aeb0 Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 8 Aug 2005 18:05:43 +0000 Subject: [PATCH] faster listing and news aging enhancement git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@505 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- doc/Download.html | 10 +++++----- htroot/Network.java | 4 ++-- htroot/News.java | 2 +- source/de/anomic/yacy/yacyNewsPool.java | 10 +++++++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/doc/Download.html b/doc/Download.html index 8e6607b04..b546b5087 100644 --- a/doc/Download.html +++ b/doc/Download.html @@ -35,20 +35,20 @@ You can download the Java

Latest Release: -The latest YaCy release version is 0.391
+The latest YaCy release version is 0.394
Nightly builds from compiles out of SVN can be obtained from http://devbin.yacy-forum.de/.

Main releases of YaCy are hosted on yacy.net, yacy@BerliOS.de and yacy@freshmeat.net.
Download Mirrors and YaCy Flavours:

diff --git a/htroot/Network.java b/htroot/Network.java index cfbc918d2..cd036ff72 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -197,7 +197,7 @@ public class Network { // generate table int page = Integer.parseInt(post.get("page", "1")); int conCount = 0; - int maxCount = 500; + int maxCount = 300; if (yacyCore.seedDB == null) { prop.put("table", 0);//no remote senior/principal proxies known" } else { @@ -221,7 +221,7 @@ public class Network { HashMap updatedWiki = new HashMap(); HashMap isCrawling = new HashMap(); int availableNews = yacyCore.newsPool.size(yacyNewsPool.INCOMING_DB); - if (availableNews > 500) availableNews = 500; + if (availableNews > 300) availableNews = 300; yacyNewsRecord record; try { for (int c = availableNews - 1; c >= 0; c--) { diff --git a/htroot/News.java b/htroot/News.java index e9ecbd431..ca9e7f277 100644 --- a/htroot/News.java +++ b/htroot/News.java @@ -118,7 +118,7 @@ public class News { } else { int maxCount = yacyCore.newsPool.size(tableID); - if (maxCount > 500) maxCount = 500; + if (maxCount > 300) maxCount = 300; yacyNewsRecord record; yacySeed seed; diff --git a/source/de/anomic/yacy/yacyNewsPool.java b/source/de/anomic/yacy/yacyNewsPool.java index 2725e5934..43d8de62a 100644 --- a/source/de/anomic/yacy/yacyNewsPool.java +++ b/source/de/anomic/yacy/yacyNewsPool.java @@ -145,7 +145,7 @@ public class yacyNewsPool { synchronized (incomingNews) { for (int i = incomingNews.size() - 1; i >= 0; i--) { record = incomingNews.top(i); - if (automaticProcessP(record)) { + if ((i > 500) || (automaticProcessP(record))) { incomingNews.pop(i); processedNews.push(record); //newsDB.remove(id); @@ -158,12 +158,16 @@ public class yacyNewsPool { private boolean automaticProcessP(yacyNewsRecord record) { if (record == null) return false; + if ((yacyCore.universalTime() - record.created().getTime()) > (1000 * 60 * 60 * 24 * 7) /* 1 Week */) { + // remove everything after 1 week + return true; + } if ((record.category().equals("wiki_upd")) && - (yacyCore.universalTime() - record.created().getTime() > 1000 * 60 * 60 * 24 /* 1 Day */)) { + ((yacyCore.universalTime() - record.created().getTime()) > (1000 * 60 * 60 * 24) /* 1 Day */)) { return true; } if ((record.category().equals("crwlstrt")) && - (yacyCore.universalTime() - record.created().getTime() > 1000 * 60 * 60 * 24 /* 1 Day */)) { + ((yacyCore.universalTime() - record.created().getTime()) > (1000 * 60 * 60 * 24) /* 1 Day */)) { yacySeed seed = yacyCore.seedDB.get(record.originator()); try { return (Integer.parseInt(seed.get("ISpeed", "-")) < 10);