From 787e1c683696dd67fc1f467b2f30223d40eaa92d Mon Sep 17 00:00:00 2001
From: orbiter <mc@yacy.net>
Date: Thu, 23 Aug 2012 11:53:54 +0200
Subject: [PATCH] added the QueryResponse query(SolrParams params) method to
 the SolrServerConnector which is necessary to use facets in solr search.

---
 .../federated/solr/AbstractSolrConnector.java |  2 +-
 .../federated/solr/SolrConnector.java         |  2 +-
 .../federated/solr/SolrServerConnector.java   | 39 ++++++++++++-------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java b/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java
index be2d71eec..01810b296 100644
--- a/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java
+++ b/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java
@@ -47,7 +47,7 @@ public abstract class AbstractSolrConnector implements SolrConnector {
         catchallQuery.setStart(0);
     }
     private final static int pagesize = 10;
-
+    
     @Override
     public boolean exists(final String id) throws IOException {
         try {
diff --git a/source/net/yacy/cora/services/federated/solr/SolrConnector.java b/source/net/yacy/cora/services/federated/solr/SolrConnector.java
index b183d4405..94938950a 100644
--- a/source/net/yacy/cora/services/federated/solr/SolrConnector.java
+++ b/source/net/yacy/cora/services/federated/solr/SolrConnector.java
@@ -112,7 +112,7 @@ public interface SolrConnector extends Iterable<String> /* Iterable of document
      * @throws IOException
      */
     public SolrDocumentList query(final String querystring, final int offset, final int count) throws IOException, SolrException;
-
+        
     /**
      * Get a query result from solr as a stream of documents.
      * The result queue is considered as terminated if AbstractSolrConnectro.POISON_DOCUMENT is returned.
diff --git a/source/net/yacy/cora/services/federated/solr/SolrServerConnector.java b/source/net/yacy/cora/services/federated/solr/SolrServerConnector.java
index cf42ce4ef..fe05ca59f 100644
--- a/source/net/yacy/cora/services/federated/solr/SolrServerConnector.java
+++ b/source/net/yacy/cora/services/federated/solr/SolrServerConnector.java
@@ -40,6 +40,8 @@ import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.NamedList;
 
 public class SolrServerConnector extends AbstractSolrConnector implements SolrConnector {
 
@@ -188,7 +190,7 @@ public class SolrServerConnector extends AbstractSolrConnector implements SolrCo
             throw new IOException(e);
         }
     }
-
+    
     /**
      * get a query result from solr
      * to get all results set the query String to "*:*"
@@ -198,26 +200,35 @@ public class SolrServerConnector extends AbstractSolrConnector implements SolrCo
     @Override
     public SolrDocumentList query(final String querystring, final int offset, final int count) throws IOException {
         // construct query
-        final SolrQuery query = new SolrQuery();
-        query.setQuery(querystring);
-        query.setRows(count);
-        query.setStart(offset);
-        //query.addSortField( "price", SolrQuery.ORDER.asc );
+        final SolrQuery params = new SolrQuery();
+        params.setQuery(querystring);
+        params.setRows(count);
+        params.setStart(offset);
+        //params.addSortField( "price", SolrQuery.ORDER.asc );
 
         // query the server
+        QueryResponse rsp = query(params);
+        final SolrDocumentList docs = rsp.getResults();
+        return docs;
+    }
+    
+    public QueryResponse query(SolrParams params) throws IOException {
         try {
-            QueryRequest request = new QueryRequest(query);
+            QueryRequest request = new QueryRequest(params);
             ResponseParser responseParser = new XMLResponseParser();
             request.setResponseParser(responseParser);
-            final QueryResponse rsp = request.process(this.server);
-            final SolrDocumentList docs = rsp.getResults();
-            return docs;
-        } catch (final Throwable e) {
-            //Log.logException(e);
-            throw new IOException(e.getMessage(), e);
+            long t = System.currentTimeMillis();
+            NamedList<Object> result = server.request(request);
+            QueryResponse response = new QueryResponse(result, server);
+            response.setElapsedTime(System.currentTimeMillis() - t);
+            return response;
+        } catch (SolrServerException e) {
+            throw new IOException(e);
+        } catch (Throwable e) {
+            throw new IOException("Error executing query", e);
         }
     }
-
+    
     private final char[] queryIDTemplate = "id:\"            \"".toCharArray();
 
     /**