From 9962b9e548d1df8b78ffda9a53a2d616c4576fbe Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Wed, 10 Sep 2014 00:52:37 +0200
Subject: [PATCH] use configured search items per page if not specified in 
 post - remove verify=cacheonly from admin screen search box to use the
 configured values   (otherwise definition overwrites configured behavior and
 is used for following searches what might give unexpected/confusing different
 results compared to using /yacysearch )

---
 htroot/env/templates/header.template | 2 --
 htroot/yacyinteractive.java          | 2 +-
 htroot/yacysearch.java               | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index 9431571c2..fed9d1d2c 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -13,8 +13,6 @@
       </a>
       <form class="navbar-form" method="get" accept-charset="UTF-8" action="/yacysearch.html" style="padding-left:200px;max-width:400px;">
         <input name="query" placeholder="Search..." class="form-control" type="text" size="36" maxlength="200" value=""/>
-        <input type="hidden" name="verify" value="cacheonly" />
-        <input type="hidden" name="maximumRecords" value="10" />
         <input type="hidden" name="resource" value="global" />
         <input type="hidden" name="urlmaskfilter" value=".*" />
         <input type="hidden" name="prefermaskfilter" value="" />
diff --git a/htroot/yacyinteractive.java b/htroot/yacyinteractive.java
index c5d840654..595c2ac23 100644
--- a/htroot/yacyinteractive.java
+++ b/htroot/yacyinteractive.java
@@ -50,7 +50,7 @@ public class yacyinteractive {
 
         final String query = (post == null) ? "" : post.get("query", "");
         final String startRecord = (post == null) ? "0" : post.get("startRecord", "");
-        final String maximumRecords = (post == null) ? "10" : post.get("maximumRecords", "");
+        final String maximumRecords = (post == null) ? sb.getConfig(SwitchboardConstants.SEARCH_ITEMS, "10") : post.get("maximumRecords", "");
         final boolean focus  = (post == null) ? true : post.get("focus", "1").equals("1");
         prop.putHTML("query", query);
         prop.put("startRecord", startRecord);
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
index c5ff4c6c9..26e4aa78f 100644
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@@ -224,7 +224,7 @@ public class yacysearch {
                         ? 100
                         : 5000) : (snippetFetchStrategy != null
                         && snippetFetchStrategy.isAllowedToFetchOnline() ? 20 : 1000),
-                post.getInt("maximumRecords", post.getInt("count", post.getInt("rows", 10)))); // SRU syntax with old property as alternative
+                post.getInt("maximumRecords", post.getInt("count", post.getInt("rows", sb.getConfigInt(SwitchboardConstants.SEARCH_ITEMS, 10))))); // SRU syntax with old property as alternative
         int startRecord = post.getInt("startRecord", post.getInt("offset", post.getInt("start", 0)));
 
         final boolean indexof = (post != null && post.get("indexof", "").equals("on"));