- removed bad debug code that caused a large and unnecessary delay during global search

- fixed problem that global search results disappear after a search
- removed some stopwords

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

build.properties

@@ -3,7 +3,7 @@ javacSource=1.4
 javacTarget=1.4
 
 # Release Configuration
-releaseVersion=0.482
+releaseVersion=0.483
 releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 #releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}

source/de/anomic/plasma/plasmaSearchEvent.java

@@ -172,11 +172,13 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
                 
                 // evaluate index abstracts and start a secondary search
                 // this is temporary debugging code to learn that the index abstracts are fetched correctly
+                /*
                 while (System.currentTimeMillis() < secondaryTimeout + 10000) {
                     if (yacySearch.remainingWaiting(primarySearchThreads) == 0) break; // all threads have finished
                     try {Thread.sleep(100);} catch (InterruptedException e) {}
                 }
                 if (query.size() > 1) prepareSecondarySearch();
+                */
                 
                 // catch up global results:
                 // wait until primary timeout passed
@@ -356,7 +358,7 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
         preorderTime = preorderTime - (System.currentTimeMillis() - pst);
         if (preorderTime < 0) preorderTime = 200;
         plasmaSearchPreOrder preorder = new plasmaSearchPreOrder(query, ranking, searchResult, preorderTime);
-        preorder.remove(true, true);
+        if (searchResult.size() > query.wantedResults) preorder.remove(true, true);
         profileLocal.setYieldTime(plasmaSearchTimingProfile.PROCESS_PRESORT);
         profileLocal.setYieldCount(plasmaSearchTimingProfile.PROCESS_PRESORT, rcLocal.size());
         
@@ -440,12 +442,12 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
         if (primarySearchThreads == null) return;
         long starttime = System.currentTimeMillis();
         while (true) {
+            flushGlobalResults(); // must be flushed before first check of remaining threads, othervise it is possible that NO results are flushed at all
+            
             remaining = yacySearch.remainingWaiting(primarySearchThreads);
             if (secondarySearchThreads != null) remaining += yacySearch.remainingWaiting(secondarySearchThreads);
             if (remaining == 0) break;
   
-            flushGlobalResults();
-  
             // wait a little bit before trying again
             try {Thread.sleep(1000);} catch (InterruptedException e) {}
             if (System.currentTimeMillis() - starttime > 90000) {

yacy.stopwords

@@ -511,12 +511,9 @@ over
 overall
 own
 paar
-page
 per
 perhaps
 post
-privat
-private
 prof
 put
 quite
@@ -613,8 +610,6 @@ stop
 stueck
 subject
 such
-suche
-suchen
 taking
 teil
 text