Moved Solr query processing from Connector to Backend.

module/VuFindSearch/src/VuFindSearch/Backend/Solr/Backend.php

@@ -169,8 +169,8 @@ class Backend implements BackendInterface, MoreLikeThis, RetrieveBatchInterface
             }
         }
 
-        $response   = $this->connector
-            ->search($query, $offset, $limit, $this->getQueryBuilder(), $params);
+        $params->mergeWith($this->getQueryBuilder()->build($query));
+        $response   = $this->connector->search($params, $offset, $limit);
         $collection = $this->createRecordCollection($response);
         $this->injectSourceIdentifier($collection);
 
@@ -241,8 +241,13 @@ class Backend implements BackendInterface, MoreLikeThis, RetrieveBatchInterface
         while (count($ids) > 0) {
             $currentPage = array_splice($ids, 0, $pageSize, array());
             $currentPage = array_map($formatIds, $currentPage);
-            $query = new Query('id:(' . implode(' OR ', $currentPage) . ')');
-            $next = $this->search($query, 0, $pageSize);
+            $params = new ParamBag(
+                array('q' => 'id:(' . implode(' OR ', $currentPage) . ')')
+            );
+            $this->injectResponseWriter($params);
+            $next = $this->createRecordCollection(
+                $this->connector->search($params, 0, $pageSize)
+            );
             if (!$results) {
                 $results = $next;
             } else {

module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php

@@ -207,23 +207,16 @@ class Connector
     /**
      * Execute a search.
      *
-     * @param AbstractQuery $query        Search query
-     * @param integer       $offset       Search offset
-     * @param integer       $limit        Search limit
-     * @param QueryBuilder  $queryBuilder Query builder
-     * @param ParamBag      $params       Parameters
+     * @param ParamBag $params Parameters
+     * @param integer  $offset Search offset
+     * @param integer  $limit  Search limit
      *
      * @return string
      */
-    public function search(AbstractQuery $query, $offset, $limit,
-        QueryBuilder $queryBuilder, ParamBag $params = null
-    ) {
-        $params = $params ?: new ParamBag();
+    public function search(ParamBag $params, $offset, $limit)
+    {
         $params->set('start', $offset);
         $params->set('rows', $limit);
-
-        $params->mergeWith($queryBuilder->build($query));
-
         return $this->select($params);
     }
 
@@ -231,7 +224,7 @@ class Connector
      * Write to the SOLR index.
      *
      * @param AbstractDocument $document Document to write
-     * @param string           $format   Serialization forma, either `json' or `xml'
+     * @param string           $format   Serialization format, either 'json' or 'xml'
      * @param string           $handler  Update handler
      * @param ParamBag         $params   Update handler parameters
      *