- added fetch-ahead again (had been removed in last commit)

- reverted default query mode to verify=false

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

build.properties

@@ -3,7 +3,7 @@ javacSource=1.5
 javacTarget=1.5
 
 # Release Configuration
-releaseVersion=0.595
+releaseVersion=0.596
 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz

htroot/yacy/user/ysearch.java

@@ -333,20 +333,4 @@ public class ysearch {
         // return rewrite properties
         return prop;
     }
-/*
-    private static String navhidden(int page, int display, plasmaSearchQuery theQuery) {
-        return
-        "<input type=\"hidden\" name=\"display\" value=\"" + display + "\" />" +
-        "<input type=\"hidden\" name=\"search\" value=\"" + theQuery.queryString() + "\" />" +
-        "<input type=\"hidden\" name=\"count\" value=\"" + theQuery.displayResults() + "\" />" +
-        "<input type=\"hidden\" name=\"offset\" value=\"" + (page * theQuery.displayResults()) + "\" />" +
-        "<input type=\"hidden\" name=\"resource\" value=\"" + theQuery.searchdom() + "\" />" +
-        "<input type=\"hidden\" name=\"urlmaskfilter\" value=\"" + theQuery.urlMask + "\" />" +
-        "<input type=\"hidden\" name=\"prefermaskfilter\" value=\"" + theQuery.prefer + "\" />" +
-        "<input type=\"hidden\" name=\"cat\" value=\"href\" />" +
-        "<input type=\"hidden\" name=\"constraint\" value=\"" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) + "\" />" +
-        "<input type=\"hidden\" name=\"contentdom\" value=\"" + theQuery.contentdom() + "\" />" +
-        "<input type=\"hidden\" name=\"former\" value=\"" + theQuery.queryString() + "\" />";
-    }
-    */
 }

htroot/yacysearch.java

@@ -76,7 +76,7 @@ public class yacysearch {
         
         // get query
         String querystring = (post == null) ? "" : post.get("query", post.get("search", "")).trim(); // SRU compliance
-        final boolean fetchSnippets = (post != null && post.get("verify", "true").equals("true"));
+        final boolean fetchSnippets = (post != null && post.get("verify", "false").equals("true"));
         final serverObjects prop = new serverObjects();
         
         final boolean rss = (post == null) ? false : post.get("rss", "false").equals("true");
@@ -435,6 +435,7 @@ public class yacysearch {
         "&maximumRecords="+ theQuery.displayResults() +
         "&startRecord=" + (page * theQuery.displayResults()) +
         "&resource=" + ((theQuery.isLocal()) ? "local" : "global") +
+        "&verify=" + ((theQuery.onlineSnippetFetch) ? "true" : "false") +
         "&urlmaskfilter=" + theQuery.urlMask +
         "&prefermaskfilter=" + theQuery.prefer +
         "&cat=href&constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) +

source/de/anomic/plasma/plasmaSearchEvent.java

@@ -195,7 +195,6 @@ public final class plasmaSearchEvent {
                 }
                 serverProfiling.update("SEARCH", new plasmaProfiling.searchEvent(query.id(true), "abstract generation", this.rankedCache.searchContainerMaps()[0].size(), System.currentTimeMillis() - timer));
             }
-            
         }
         
         if (query.onlineSnippetFetch) {
@@ -462,8 +461,7 @@ public final class plasmaSearchEvent {
         }
 
         // if worker threads had been alive, but did not succeed, start them again to fetch missing links
-        if ((query.onlineSnippetFetch) &&
-            (!event.anyWorkerAlive()) &&
+        if ((!event.anyWorkerAlive()) &&
             (((query.contentdom == plasmaSearchQuery.CONTENTDOM_IMAGE) && (event.images.size() + 30 < query.neededResults())) ||
              (event.result.size() < query.neededResults() + 10)) &&
             (event.getRankingResult().getLocalResourceSize() + event.getRankingResult().getRemoteResourceSize() > event.result.size())) {
@@ -473,7 +471,7 @@ public final class plasmaSearchEvent {
             event.workerThreads = new resultWorker[workerThreadCount];
             resultWorker worker;
             for (int i = 0; i < workerThreadCount; i++) {
-                worker = event.new resultWorker(i, 6000, 2);
+                worker = event.new resultWorker(i, 6000, (query.onlineSnippetFetch) ? 2 : 0);
                 worker.start();
                 event.workerThreads[i] = worker;
             }
@@ -500,12 +498,13 @@ public final class plasmaSearchEvent {
 
             // start fetching urls and snippets
             indexURLReference page;
+            final int fetchAhead = snippetMode == 0 ? 0 : 10;
             while (System.currentTimeMillis() < this.timeout) {
                 this.lastLifeSign = System.currentTimeMillis();
 
                 // check if we have enough
-                if ((query.contentdom == plasmaSearchQuery.CONTENTDOM_IMAGE) && (images.size() >= query.neededResults())) break;
-                if ((query.contentdom != plasmaSearchQuery.CONTENTDOM_IMAGE) && (result.size() >= query.neededResults())) break;
+                if ((query.contentdom == plasmaSearchQuery.CONTENTDOM_IMAGE) && (images.size() >= query.neededResults() + fetchAhead)) break;
+                if ((query.contentdom != plasmaSearchQuery.CONTENTDOM_IMAGE) && (result.size() >= query.neededResults() + fetchAhead)) break;
 
                 // get next entry
                 page = rankedCache.bestURL(true);