diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Backend.php index 04754e5ed49764e312147b6fd8a8a6d0eeb8e725..4053088dc53861a5670481162685893d8d9679da 100644 --- a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Backend.php +++ b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Backend.php @@ -127,9 +127,8 @@ class Backend implements BackendInterface public function search(AbstractQuery $query, $offset, $limit, ParamBag $params = null ) { - $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); return $collection; diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php index 07a866166730c8962c4b2992b9ac56d391d46e66..d8ab2b433b7d52d08e68731a531f7aa272fae120 100644 --- a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php +++ b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php @@ -130,23 +130,18 @@ class Connector extends \VuFindSearch\Backend\SRU\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 array + * @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('startRecord', $offset); $params->set('maximumRecords', $limit); $params->set('servicelevel', 'full'); $params->set('wskey', $this->wskey); - $params->mergeWith($queryBuilder->build($query)); // Establish a limitation on searching by OCLC Codes if (!empty($this->limitCodes)) {