mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
This commit is contained in:
commit
d3b000b089
2
htroot/env/templates/header.template
vendored
2
htroot/env/templates/header.template
vendored
|
@ -13,8 +13,6 @@
|
||||||
</a>
|
</a>
|
||||||
<form class="navbar-form" method="get" accept-charset="UTF-8" action="/yacysearch.html" style="padding-left:200px;max-width:400px;">
|
<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 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="resource" value="global" />
|
||||||
<input type="hidden" name="urlmaskfilter" value=".*" />
|
<input type="hidden" name="urlmaskfilter" value=".*" />
|
||||||
<input type="hidden" name="prefermaskfilter" value="" />
|
<input type="hidden" name="prefermaskfilter" value="" />
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class yacyinteractive {
|
||||||
|
|
||||||
final String query = (post == null) ? "" : post.get("query", "");
|
final String query = (post == null) ? "" : post.get("query", "");
|
||||||
final String startRecord = (post == null) ? "0" : post.get("startRecord", "");
|
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");
|
final boolean focus = (post == null) ? true : post.get("focus", "1").equals("1");
|
||||||
prop.putHTML("query", query);
|
prop.putHTML("query", query);
|
||||||
prop.put("startRecord", startRecord);
|
prop.put("startRecord", startRecord);
|
||||||
|
|
|
@ -224,7 +224,7 @@ public class yacysearch {
|
||||||
? 100
|
? 100
|
||||||
: 5000) : (snippetFetchStrategy != null
|
: 5000) : (snippetFetchStrategy != null
|
||||||
&& snippetFetchStrategy.isAllowedToFetchOnline() ? 20 : 1000),
|
&& 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)));
|
int startRecord = post.getInt("startRecord", post.getInt("offset", post.getInt("start", 0)));
|
||||||
|
|
||||||
final boolean indexof = (post != null && post.get("indexof", "").equals("on"));
|
final boolean indexof = (post != null && post.get("indexof", "").equals("on"));
|
||||||
|
|
Loading…
Reference in New Issue
Block a user