From 2018e55f8b7b54c76e1dae96797ee8bb1f55707f Mon Sep 17 00:00:00 2001 From: orbiter Date: Sun, 29 Dec 2013 01:39:30 +0100 Subject: [PATCH] switched back on index deletion (was accidently off because new jetty framework delivers never null to post arguments .. there may be more of that kind of problems) --- htroot/IndexControlURLs_p.java | 2 +- source/net/yacy/http/servlets/SolrServlet.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/htroot/IndexControlURLs_p.java b/htroot/IndexControlURLs_p.java index 6bae5637e..c1e4ca30b 100644 --- a/htroot/IndexControlURLs_p.java +++ b/htroot/IndexControlURLs_p.java @@ -84,7 +84,7 @@ public class IndexControlURLs_p { List dumpFiles = segment.fulltext().dumpFiles(); prop.put("dumprestore_dumpfile", dumpFiles.size() == 0 ? "" : dumpFiles.get(dumpFiles.size() - 1).getAbsolutePath()); prop.put("dumprestore_optimizemax", 10); - prop.put("cleanup", post == null ? 1 : 0); + prop.put("cleanup", post == null || post.size() == 0 ? 1 : 0); prop.put("cleanup_solr", segment.fulltext().connectedRemoteSolr() ? 1 : 0); prop.put("cleanup_rwi", segment.termIndex() != null && !segment.termIndex().isEmpty() ? 1 : 0); prop.put("cleanup_citation", segment.connectedCitation() && !segment.urlCitation().isEmpty() ? 1 : 0); diff --git a/source/net/yacy/http/servlets/SolrServlet.java b/source/net/yacy/http/servlets/SolrServlet.java index 11c5e876b..9122d06f6 100644 --- a/source/net/yacy/http/servlets/SolrServlet.java +++ b/source/net/yacy/http/servlets/SolrServlet.java @@ -29,7 +29,6 @@ import java.io.Writer; import java.net.URL; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.servlet.Filter; @@ -51,7 +50,6 @@ import net.yacy.cora.federate.solr.responsewriter.GrepHTMLResponseWriter; import net.yacy.cora.federate.solr.responsewriter.HTMLResponseWriter; import net.yacy.cora.federate.solr.responsewriter.OpensearchResponseWriter; import net.yacy.cora.federate.solr.responsewriter.YJsonResponseWriter; -import net.yacy.cora.federate.solr.responsewriter.OpensearchResponseWriter.ResHead; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; import net.yacy.search.query.AccessTracker; @@ -66,7 +64,6 @@ import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.DisMaxParams; import org.apache.solr.common.params.MultiMapSolrParams; import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.core.SolrCore; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestInfo;