Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
Override qf and df Solr params with defaults only when they are not set
luccioman313204ae2c8c
diff --git a/source/net/yacy/http/servlets/SolrSelectServlet.java b/source/net/yacy/http/servlets/SolrSelectServlet.javaindex 00caef7fb..aa9f92eb1 100644--- a/source/net/yacy/http/servlets/SolrSelectServlet.java+++ b/source/net/yacy/http/servlets/SolrSelectServlet.java@@ -245,13 +245,13 @@ public class SolrSelectServlet extends HttpServlet {// add default queryfield parameter according to local ranking config (or defaultfield)if (ranking != null) { // ranking normally never nullfinal String qf = ranking.getQueryFields();- if (qf.length() > 4) { // make sure qf has content (else use df)+ if (qf.length() > 4 && !mmsp.getMap().containsKey(DisMaxParams.QF)) { // make sure qf has content (else use df)MultiMapSolrParams.addParam(DisMaxParams.QF, qf, mmsp.getMap()); // add QF that we set to be best suited for our index// TODO: if every peer applies a decent QF itself, this can be reverted to getMap().put()- } else {+ } else if(!mmsp.getMap().containsKey(CommonParams.DF)) {mmsp.getMap().put(CommonParams.DF, new String[]{CollectionSchema.text_t.getSolrFieldName()});}- } else {+ } else if(!mmsp.getMap().containsKey(CommonParams.DF)) {mmsp.getMap().put(CommonParams.DF, new String[]{CollectionSchema.text_t.getSolrFieldName()});}