diff --git a/htroot/ConfigHeuristics_p.java b/htroot/ConfigHeuristics_p.java index 0f0cfa6ee..fbfadab18 100644 --- a/htroot/ConfigHeuristics_p.java +++ b/htroot/ConfigHeuristics_p.java @@ -26,7 +26,9 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import com.google.common.io.Files; + import java.io.File; + import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.storage.Configuration; import net.yacy.cora.util.ConcurrentLog; @@ -35,6 +37,7 @@ import net.yacy.search.Switchboard; import java.io.IOException; import java.util.Iterator; + import net.yacy.cora.federate.opensearch.OpenSearchConnector; import net.yacy.cora.federate.solr.SchemaConfiguration; import net.yacy.search.SwitchboardConstants; @@ -188,6 +191,7 @@ public class ConfigHeuristics_p { return prop; } + @SuppressWarnings("unused") private static void writeopensearchcfg(final Switchboard sb, final serverObjects post) { // read index schema table flags diff --git a/htroot/Connections_p.java b/htroot/Connections_p.java index 99804683a..be76f0a7c 100644 --- a/htroot/Connections_p.java +++ b/htroot/Connections_p.java @@ -41,7 +41,7 @@ import net.yacy.server.serverSwitch; public final class Connections_p { - public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) { + public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, @SuppressWarnings("unused") final serverObjects post, final serverSwitch env) { // return variable that accumulates replacements final Switchboard sb = (Switchboard) env; final serverObjects prop = new serverObjects(); @@ -49,19 +49,6 @@ public final class Connections_p { // server sessions // get the serverCore thread final YaCyHttpServer httpd = sb.getHttpServer(); - - // determines if name lookup should be done or not - final boolean doNameLookup; - if (post != null) { - doNameLookup = post.getBoolean("nameLookup"); - if (post.containsKey("closeServerSession")) { - final String sessionName = post.get("closeServerSession", null); - prop.put(serverObjects.ACTION_LOCATION,""); - return prop; - } - } else { - doNameLookup = false; - } // waiting for all threads to finish int idx = 0, numActivePending = 0; diff --git a/htroot/yacy/ui/yacyui-welcome.html b/htroot/yacy/ui/yacyui-welcome.html index 79e0a496d..19ad27bcd 100644 --- a/htroot/yacy/ui/yacyui-welcome.html +++ b/htroot/yacy/ui/yacyui-welcome.html @@ -40,14 +40,7 @@ apfelmaennchen \ No newline at end of file diff --git a/source/net/yacy/document/content/DCEntry.java b/source/net/yacy/document/content/DCEntry.java index ed2591054..96b6e11fa 100644 --- a/source/net/yacy/document/content/DCEntry.java +++ b/source/net/yacy/document/content/DCEntry.java @@ -269,9 +269,8 @@ public class DCEntry extends MultiMapSolrParams { if (t != null) { t = stripCDATA(t); return t.split(";"); - } else { - tx = this.getParams("dc:subject"); } + tx = this.getParams("dc:subject"); if (tx != null) { for (int i = 0; i < tx.length; i++) { diff --git a/source/net/yacy/server/http/HTTPDFileHandler.java b/source/net/yacy/server/http/HTTPDFileHandler.java index 556ffd9c2..6494f3d3b 100644 --- a/source/net/yacy/server/http/HTTPDFileHandler.java +++ b/source/net/yacy/server/http/HTTPDFileHandler.java @@ -58,7 +58,6 @@ package net.yacy.server.http; import java.io.File; -import java.util.Date; import net.yacy.cora.document.analysis.Classification; import net.yacy.cora.util.ConcurrentLog; diff --git a/source/net/yacy/server/http/HTTPDProxyHandler.java b/source/net/yacy/server/http/HTTPDProxyHandler.java index b26ba0ef8..985638fc5 100644 --- a/source/net/yacy/server/http/HTTPDProxyHandler.java +++ b/source/net/yacy/server/http/HTTPDProxyHandler.java @@ -99,7 +99,6 @@ public final class HTTPDProxyHandler { private static Switchboard sb = null; private static final HashSet yellowList; private static int timeout = 60000; - private static boolean yacyTrigger = true; private static Process redirectorProcess = null; private static boolean redirectorEnabled = false; private static PrintWriter redirectorWriter = null;