remove of several results from a single domain is stopped if the result set is smaller than the wanted number of results

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1811 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/plasma/plasmaSearchEvent.java

@@ -254,8 +254,8 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
         
         // apply filter
         profileLocal.startTimer();
-        acc.removeDoubleDom();
         //acc.removeRedundant();
+        acc.removeDoubleDom();
         profileLocal.setYieldTime(plasmaSearchTimingProfile.PROCESS_FILTER);
         profileLocal.setYieldCount(plasmaSearchTimingProfile.PROCESS_FILTER, acc.sizeOrdered());
         

source/de/anomic/plasma/plasmaSearchResult.java

@@ -172,6 +172,7 @@ public final class plasmaSearchResult {
         String dom;
         
         while (i.hasNext()) {
+        		if (pageAcc.size() <= query.wantedResults) return;
             entry = (Map.Entry) i.next();
             dom = ((plasmaCrawlLURL.Entry) entry.getValue()).url().getHost();
             if (doms.contains(dom)) i.remove(); else doms.add(dom);

yacy.init

@@ -417,7 +417,7 @@ xpstopw=true
 # the prereq-value is a memory pre-requisite: that much bytes must
 # be available/free in the heap; othervise the loop is not executed
 # and another idlesleep is performed
-20_dhtdistribution_idlesleep=50000
+20_dhtdistribution_idlesleep=20000
 20_dhtdistribution_busysleep=2000
 20_dhtdistribution_memprereq=8388608
 20_dhtdistribution_threads=1