From ab9583d42976822bcb15d313891defe5a81ef25e Mon Sep 17 00:00:00 2001 From: reger Date: Thu, 26 Sep 2013 22:20:35 +0200 Subject: [PATCH] add default field (&df) to SolrServlet query if missing --- source/net/yacy/cora/federate/solr/SolrServlet.java | 7 ++++++- source/net/yacy/http/HttpServer.java | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/source/net/yacy/cora/federate/solr/SolrServlet.java b/source/net/yacy/cora/federate/solr/SolrServlet.java index 05506615f..4d5a436c5 100644 --- a/source/net/yacy/cora/federate/solr/SolrServlet.java +++ b/source/net/yacy/cora/federate/solr/SolrServlet.java @@ -122,7 +122,12 @@ public class SolrServlet implements Filter { // prepare request to solr hrequest.setAttribute("org.apache.solr.CoreContainer", core); - MultiMapSolrParams mmsp = SolrRequestParsers.parseQueryString(hrequest.getQueryString()); + // add default search field if missing + String queryStr = hrequest.getQueryString(); + if (!queryStr.contains("&df=")) { + queryStr = queryStr + "&df=*"; + } + MultiMapSolrParams mmsp = SolrRequestParsers.parseQueryString(queryStr); req = connector.request(mmsp); SolrQueryResponse rsp = connector.query(req); diff --git a/source/net/yacy/http/HttpServer.java b/source/net/yacy/http/HttpServer.java index b19153208..62fb0e1ea 100644 --- a/source/net/yacy/http/HttpServer.java +++ b/source/net/yacy/http/HttpServer.java @@ -80,6 +80,7 @@ public class HttpServer { SolrServlet.initCore(sb.index.fulltext().getDefaultEmbeddedConnector()); solrContext.addFilter(new FilterHolder(SolrServlet.class), "/*", EnumSet.of(DispatcherType.REQUEST)); + // configure root context ServletContextHandler htrootContext = new ServletContextHandler(ServletContextHandler.SESSIONS); htrootContext.setContextPath("/"); ServletHolder sholder = new ServletHolder(YaCyDefaultServlet.class);