diff --git a/source/net/yacy/cora/services/federated/solr/ShardSolrConnector.java b/source/net/yacy/cora/services/federated/solr/ShardSolrConnector.java index 3f23f6f6f..d3dca171b 100644 --- a/source/net/yacy/cora/services/federated/solr/ShardSolrConnector.java +++ b/source/net/yacy/cora/services/federated/solr/ShardSolrConnector.java @@ -174,15 +174,6 @@ public class ShardSolrConnector extends AbstractSolrConnector implements SolrCon return list; } - public SolrDocumentList[] getList(final String querystring, final int offset, final int count) throws IOException { - final SolrDocumentList[] list = new SolrDocumentList[this.connectors.size()]; - int i = 0; - for (final SolrConnector connector: this.connectors) { - list[i++] = connector.query(querystring, offset, count); - } - return list; - } - public long[] getSizeList() { final long[] size = new long[this.connectors.size()]; int i = 0; diff --git a/source/net/yacy/peers/Protocol.java b/source/net/yacy/peers/Protocol.java index af076c40e..6a0a66e1e 100644 --- a/source/net/yacy/peers/Protocol.java +++ b/source/net/yacy/peers/Protocol.java @@ -103,7 +103,6 @@ import net.yacy.search.EventTracker; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; import net.yacy.search.index.Segment; -import net.yacy.search.index.YaCySchema; import net.yacy.search.query.SearchEvent; import net.yacy.search.snippet.TextSnippet; @@ -1031,7 +1030,7 @@ public final class Protocol } event.rankingProcess.addExpectedRemoteReferences(count); SolrDocumentList docList = null; - final String solrQuerystring = YaCySchema.text_t + ":" + event.getQuery().solrQueryString(); + final String solrQuerystring = "{!lucene q.op=AND df=text_t}" + event.getQuery().solrQueryString(false); boolean localsearch = target == null || target.equals(event.peers.mySeed()); if (localsearch) { // search the local index diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java index f7f4cc5df..61d1ee05e 100644 --- a/source/net/yacy/search/query/QueryParams.java +++ b/source/net/yacy/search/query/QueryParams.java @@ -474,13 +474,14 @@ public final class QueryParams { return ret; } - public String solrQueryString() { + public String solrQueryString(boolean urlencoded) { final StringBuilder q = new StringBuilder(); if (this.query_include_words != null) { - for (String s: this.query_include_words) q.append('+').append(s); - for (String s: this.query_exclude_words) q.append("+-").append(s); + for (String s: this.query_include_words) q.append(urlencoded ? '+' : ' ').append(s); + for (String s: this.query_exclude_words) q.append(urlencoded ? "+-" : " -").append(s); } - return CharacterCoding.unicode2html(q.length() > 0 ? q.substring(1) : q.toString(), true); + if (urlencoded) return CharacterCoding.unicode2html(q.length() > 0 ? q.substring(1) : q.toString(), true); + return q.length() > 0 ? q.substring(1) : q.toString(); } public String queryStringForUrl() {