From 7cda48a9d62ed1d84188c0fed6901c76e518661e Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Wed, 9 Dec 2015 00:49:38 +0100
Subject: [PATCH] add hint to "default max results per page" limit on
 ConfigPortal (limit is applied in yacysearch & max. total results by sum
 result-stack size) - remove obsolete search.navigation prop (has moved to
 ConfigSearchPage_p)

---
 htroot/ConfigPortal.html | 2 +-
 htroot/ConfigPortal.java | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/htroot/ConfigPortal.html b/htroot/ConfigPortal.html
index 760d9ad17..26d183beb 100644
--- a/htroot/ConfigPortal.html
+++ b/htroot/ConfigPortal.html
@@ -78,7 +78,7 @@
           </dd>
           
           <dt>Default maximum number of results per page</dt>
-          <dd><input type="text" name="maximumRecords" value="#[maximumRecords]#" size="3" /></dd>
+          <dd><input type="text" name="maximumRecords" value="#[maximumRecords]#" size="3" /> <small>max = 100 (with CACHEONLY=5000)</small></dd>
 
           <dt>Default index.html Page (by forwarder)</dt>
           <dd><input type="text" name="indexForward" value="#[indexForward]#" size="60" /></dd>
diff --git a/htroot/ConfigPortal.java b/htroot/ConfigPortal.java
index 2205e2fa9..003404d0d 100644
--- a/htroot/ConfigPortal.java
+++ b/htroot/ConfigPortal.java
@@ -171,12 +171,6 @@ public class ConfigPortal {
         
         prop.put(SwitchboardConstants.REMOTESEARCH_RESULT_STORE, sb.getConfigBool(SwitchboardConstants.REMOTESEARCH_RESULT_STORE, true) ? 1 : 0);
 
-        prop.put("search.navigation.hosts", sb.getConfig("search.navigation", "").indexOf("hosts",0) >= 0 ? 1 : 0);
-        prop.put("search.navigation.authors", sb.getConfig("search.navigation", "").indexOf("authors",0) >= 0 ? 1 : 0);
-        prop.put("search.navigation.collections", sb.getConfig("search.navigation", "").indexOf("collections",0) >= 0 ? 1 : 0);
-        prop.put("search.navigation.namespace", sb.getConfig("search.navigation", "").indexOf("namespace",0) >= 0 ? 1 : 0);
-        prop.put("search.navigation.topics", sb.getConfig("search.navigation", "").indexOf("topics",0) >= 0 ? 1 : 0);
-
         prop.put("search.verify.nocache", sb.getConfig("search.verify", "").equals("nocache") ? 1 : 0);
         prop.put("search.verify.iffresh", sb.getConfig("search.verify", "").equals("iffresh") ? 1 : 0);
         prop.put("search.verify.ifexist", sb.getConfig("search.verify", "").equals("ifexist") ? 1 : 0);