added steering of navigator computation:

- by default the navigator computation if off for servlet yacysearch.html, but:
- the servlet is called by default with a option to switch navigator results on
this will prevent that metasearch users will get slow results that are caused by unnecessary computations

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

htroot/index.html

@@ -40,6 +40,7 @@
         <input type="hidden" name="maximumRecords" value="#[maximumRecords]#" />
         <input type="hidden" name="startRecord" value="0" />
         <input type="hidden" name="resource" value="global" />
+        <input type="hidden" name="nav" value="all" />
         <input type="hidden" name="urlmaskfilter" value=".*" />
         <input type="hidden" name="prefermaskfilter" value="" />
         <input type="hidden" name="indexof" value="off" />

htroot/yacysearch.html

@@ -77,6 +77,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
         <input type="hidden" name="startRecord" value="#[offset]#" />
         <input type="hidden" name="verify" value="#[verify]#" />
         <input type="hidden" name="resource" value="#[resource]#" />
+        <input type="hidden" name="nav" value="all" />
         <input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#" />
         <input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
         <input type="hidden" name="depth" value="#[depth]#" />

htroot/yacysearch.java

@@ -465,7 +465,7 @@ public class yacysearch {
             	resnav.append("<img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\">&nbsp;");
             } else {
             	resnav.append("<a href=\"");
-                resnav.append(plasmaSearchQuery.navurl("html", thispage - 1, display, theQuery, originalUrlMask, null));
+                resnav.append(plasmaSearchQuery.navurl("html", thispage - 1, display, theQuery, originalUrlMask, null, navigation));
             	resnav.append("\"><img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\"></a>&nbsp;");
             }
             final int numberofpages = Math.min(10, Math.min(thispage + 2, totalcount / theQuery.displayResults()));
@@ -476,7 +476,7 @@ public class yacysearch {
                     resnav.append(".gif\" width=\"16\" height=\"16\">&nbsp;");
                 } else {
                     resnav.append("<a href=\"");
-                    resnav.append(plasmaSearchQuery.navurl("html", i, display, theQuery, originalUrlMask, null));
+                    resnav.append(plasmaSearchQuery.navurl("html", i, display, theQuery, originalUrlMask, null, navigation));
                     resnav.append("\"><img src=\"env/grafics/navd");
                 	resnav.append(i + 1);
                 	resnav.append(".gif\" width=\"16\" height=\"16\"></a>&nbsp;");
@@ -486,7 +486,7 @@ public class yacysearch {
             	resnav.append("<img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\">");
             } else {
                 resnav.append("<a href=\"");
-                resnav.append(plasmaSearchQuery.navurl("html", thispage + 1, display, theQuery, originalUrlMask, null));
+                resnav.append(plasmaSearchQuery.navurl("html", thispage + 1, display, theQuery, originalUrlMask, null, navigation));
                 resnav.append("\"><img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\"></a>");
             }
             prop.put("num-results_resnav", resnav.toString());

htroot/yacysearchtrailer.java

@@ -66,8 +66,8 @@ public class yacysearchtrailer {
         	int i;
         	for (i = 0; i < hostNavigator.size(); i++) {
         		entry = hostNavigator.get(i);
-        		prop.put("nav-domains_element_" + i + "_url", "<a href=\"" + plasmaSearchQuery.navurl("html", 0, display, theQuery, theQuery.urlMask, "site:" + entry.name) + "\">" + entry.name + " (" + entry.count + ")</a>");
-        		prop.putJSON("nav_domains_element_" + i + "_url-json", plasmaSearchQuery.navurl("json", 0, display, theQuery, theQuery.urlMask, "site:" + entry.name));
+        		prop.put("nav-domains_element_" + i + "_url", "<a href=\"" + plasmaSearchQuery.navurl("html", 0, display, theQuery, theQuery.urlMask, "site:" + entry.name, theQuery.navigators) + "\">" + entry.name + " (" + entry.count + ")</a>");
+        		prop.putJSON("nav_domains_element_" + i + "_url-json", plasmaSearchQuery.navurl("json", 0, display, theQuery, theQuery.urlMask, "site:" + entry.name, theQuery.navigators));
                 prop.put("nav-domains_element_" + i + "_name", entry.name);
         		prop.put("nav-domains_element_" + i + "_count", entry.count);
         		prop.put("nav-domains_element_" + i + "_modifier", "site:" + entry.name);
@@ -92,8 +92,8 @@ public class yacysearchtrailer {
                 if (/*(theQuery == null) ||*/ (theQuery.queryString == null)) break;
                 if (e != null && e.name != null) {
                     prop.putHTML("nav-topics_element_" + i + "_name", e.name);
-                    prop.put("nav-topics_element_" + i + "_url", "<a href=\"" + plasmaSearchQuery.navurl("html", 0, display, theQuery, theQuery.urlMask, e.name) + "\">" + e.name + " (" + e.count + ")</a>");
-                    prop.putJSON("nav-topics_element_" + i + "_url-json", plasmaSearchQuery.navurl("json", 0, display, theQuery, theQuery.urlMask, e.name));
+                    prop.put("nav-topics_element_" + i + "_url", "<a href=\"" + plasmaSearchQuery.navurl("html", 0, display, theQuery, theQuery.urlMask, e.name, theQuery.navigators) + "\">" + e.name + " (" + e.count + ")</a>");
+                    prop.putJSON("nav-topics_element_" + i + "_url-json", plasmaSearchQuery.navurl("json", 0, display, theQuery, theQuery.urlMask, e.name, theQuery.navigators));
                     prop.put("nav-topics_element_" + i + "_count", e.count);
                     prop.put("nav-topics_element_" + i + "_offset", "0");
                     prop.put("nav-topics_element_" + i + "_display", display);

source/de/anomic/plasma/plasmaSearchEvent.java

@@ -525,6 +525,7 @@ public final class plasmaSearchEvent {
             // start fetching urls and snippets
             URLMetadataRow page;
             final int fetchAhead = snippetMode == 0 ? 0 : 10;
+            boolean nav_topics = query.navigators.equals("all") || query.navigators.indexOf("topics") >= 0;
             try {
                 while (System.currentTimeMillis() < this.timeout) {
                     this.lastLifeSign = System.currentTimeMillis();
@@ -556,7 +557,7 @@ public final class plasmaSearchEvent {
                     // place the result to the result vector
                     if (!result.exists(resultEntry)) {
                         result.push(resultEntry, Long.valueOf(rankedCache.getOrder().cardinal(resultEntry.word())));
-                        rankedCache.addTopics(resultEntry);
+                        if (nav_topics) rankedCache.addTopics(resultEntry);
                     }
                     //System.out.println("DEBUG SNIPPET_LOADING: thread " + id + " got " + resultEntry.url());
                 }

source/de/anomic/plasma/plasmaSearchQuery.java

@@ -343,7 +343,7 @@ public final class plasmaSearchQuery {
      * @param addToQuery
      * @return
      */
-    public static String navurl(String ext, final int page, final int display, final plasmaSearchQuery theQuery, final String originalUrlMask, String addToQuery) {
+    public static String navurl(String ext, final int page, final int display, final plasmaSearchQuery theQuery, final String originalUrlMask, String addToQuery, String nav) {
         return
         "/yacysearch." + ext + "?display=" + display +
         "&search=" + theQuery.queryString(true) + ((addToQuery == null) ? "" : "+" + addToQuery) +
@@ -351,6 +351,7 @@ public final class plasmaSearchQuery {
         "&startRecord=" + (page * theQuery.displayResults()) +
         "&resource=" + ((theQuery.isLocal()) ? "local" : "global") +
         "&verify=" + ((theQuery.onlineSnippetFetch) ? "true" : "false") +
+        "&nav=" + nav +
         "&urlmaskfilter=" + originalUrlMask +
         "&prefermaskfilter=" + theQuery.prefer +
         "&cat=href&constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) +

source/de/anomic/plasma/plasmaSearchRankingProcess.java

@@ -162,6 +162,7 @@ public final class plasmaSearchRankingProcess {
         Long r;
         hoststat hs;
         String domhash;
+        boolean nav_hosts = this.query.navigators.equals("all") || this.query.navigators.indexOf("hosts") >= 0;
         while (i.hasNext()) {
             iEntry = i.next();
             assert (iEntry.metadataHash().length() == index.row().primaryKeyLength);
@@ -203,12 +204,14 @@ public final class plasmaSearchRankingProcess {
             this.domZones[yacyURL.domDomain(iEntry.metadataHash())]++;
             
             // get statistics for host navigator
-            domhash = iEntry.urlHash.substring(6);
-            hs = this.hostNavigator.get(domhash);
-            if (hs == null) {
-            	this.hostNavigator.put(domhash, new hoststat(iEntry.urlHash));
-            } else {
-            	hs.inc();
+            if (nav_hosts) {
+	            domhash = iEntry.urlHash.substring(6);
+	            hs = this.hostNavigator.get(domhash);
+	            if (hs == null) {
+	            	this.hostNavigator.put(domhash, new hoststat(iEntry.urlHash));
+	            } else {
+	            	hs.inc();
+	            }
             }
             
             // insert
@@ -410,7 +413,9 @@ public final class plasmaSearchRankingProcess {
     }
     
     public ArrayList<NavigatorEntry> getHostNavigator(int count) {
-        hoststat[] hsa = this.hostNavigator.values().toArray(new hoststat[this.hostNavigator.size()]);
+    	if (!this.query.navigators.equals("all") && this.query.navigators.indexOf("hosts") < 0) return new ArrayList<NavigatorEntry>(0);
+        
+    	hoststat[] hsa = this.hostNavigator.values().toArray(new hoststat[this.hostNavigator.size()]);
         Arrays.sort(hsa, hscomp);
         int rc = Math.min(count, hsa.length);
         ArrayList<NavigatorEntry> result = new ArrayList<NavigatorEntry>();
@@ -438,6 +443,7 @@ public final class plasmaSearchRankingProcess {
     public ArrayList<NavigatorEntry> getTopicNavigator(final int count) {
         // create a list of words that had been computed by statistics over all
         // words that appeared in the url or the description of all urls
+        if (!this.query.navigators.equals("all") && this.query.navigators.indexOf("topics") < 0) return new ArrayList<NavigatorEntry>(0);
         
         Map.Entry<String, Integer>[] a = this.ref.entrySet().toArray(new Map.Entry[this.ref.size()]);
         Arrays.sort(a, mecomp);