diff --git a/htroot/yacyinteractive.java b/htroot/yacyinteractive.java index 595c2ac23..9a91763b9 100644 --- a/htroot/yacyinteractive.java +++ b/htroot/yacyinteractive.java @@ -53,8 +53,8 @@ public class yacyinteractive { 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); - prop.put("maximumRecords", maximumRecords); + prop.putHTML("startRecord", startRecord); + prop.putHTML("maximumRecords", maximumRecords); prop.putHTML("querys", query.replaceAll(" ", "+")); prop.put("serverlist", query.isEmpty() ? 1 : 0); prop.put("focus", focus ? 1 : 0); diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 5107927fd..c856421ae 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -28,7 +28,6 @@ // if the shell's current path is HTROOT import java.io.IOException; -import java.net.InetAddress; import java.util.ArrayList; import java.util.Collection; import java.util.ConcurrentModificationException; @@ -868,13 +867,9 @@ public class yacysearch { prop.putHTML("prefermaskfilter", prefermask); prop.put("indexof", (indexof) ? "on" : "off"); prop.put("constraint", (constraint == null) ? "" : constraint.exportB64()); - prop.put("search.verify", snippetFetchStrategy == null - ? sb.getConfig("search.verify", "iffresh") - : snippetFetchStrategy.toName()); - prop.put( - "search.navigation", - (post == null) ? sb.getConfig("search.navigation", "all") : post.get("nav", "all")); - prop.put("contentdom", (post == null ? "text" : post.get("contentdom", "text"))); + prop.put("search.verify", snippetFetchStrategy == null ? sb.getConfig("search.verify", "iffresh") : snippetFetchStrategy.toName()); + prop.put("search.navigation", (post == null) ? sb.getConfig("search.navigation", "all") : post.get("nav", "all")); + prop.putHTML("contentdom", (post == null ? "text" : post.get("contentdom", "text"))); // for RSS: don't HTML encode some elements prop.putXML("rss_query", originalquerystring); @@ -883,8 +878,8 @@ public class yacysearch { sb.localSearchLastAccess = System.currentTimeMillis(); // hostname and port (assume locahost if nothing helps) - final InetAddress hostIP = Domains.myPublicLocalIP(); - prop.put("myhost", hostIP != null ? hostIP.getHostAddress() : Domains.LOCALHOST); + final String hostIP = sb.peers.mySeed().getIP(); + prop.put("myhost", hostIP != null ? hostIP : Domains.LOCALHOST); prop.put("myport", sb.getConfig("port", "8090")); // return rewrite properties