diff --git a/module/VuFind/src/VuFind/Search/Solr/Results.php b/module/VuFind/src/VuFind/Search/Solr/Results.php index 06b9a0a1df04f5c9859e775dd7e458c4b714940a..140275657b11d3fa1f596bbecd0a850e6b856a95 100644 --- a/module/VuFind/src/VuFind/Search/Solr/Results.php +++ b/module/VuFind/src/VuFind/Search/Solr/Results.php @@ -134,7 +134,7 @@ class Results extends BaseResults // Construct record drivers for all the items in the response: $this->results = array(); for ($x = 0; $x < count($this->rawResponse['response']['docs']); $x++) { - $this->results[] = static::initRecordDriver( + $this->results[] = $this->initRecordDriver( $this->rawResponse['response']['docs'][$x] ); } @@ -470,7 +470,7 @@ class Results extends BaseResults 'Record ' . $id . ' does not exist.' ); } - return static::initRecordDriver($record); + return $this->initRecordDriver($record); } /** @@ -519,7 +519,7 @@ class Results extends BaseResults $rawResponse = $solr->getMoreLikeThis($id, $extras); $results = array(); for ($x = 0; $x < count($rawResponse['response']['docs']); $x++) { - $results[] = static::initRecordDriver( + $results[] = $this->initRecordDriver( $rawResponse['response']['docs'][$x] ); } @@ -527,14 +527,14 @@ class Results extends BaseResults } /** - * Support method for _performSearch(): given an array of Solr response data, + * Support method for performSearch(): given an array of Solr response data, * construct an appropriate record driver object. * * @param array $data Solr data * * @return \VuFind\RecordDriver\Base */ - protected static function initRecordDriver($data) + protected function initRecordDriver($data) { // Remember bad classes to prevent unnecessary file accesses. static $badClasses = array(); diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Results.php b/module/VuFind/src/VuFind/Search/SolrAuth/Results.php index c27ffc2073a2df5765b1be66cb0588dce70b81ff..9a3c5bad9af9ff4e31f92b6a43fe3d2371133300 100644 --- a/module/VuFind/src/VuFind/Search/SolrAuth/Results.php +++ b/module/VuFind/src/VuFind/Search/SolrAuth/Results.php @@ -67,14 +67,14 @@ class Results extends SolrResults } /** - * Support method for _performSearch(): given an array of Solr response data, + * Support method for performSearch(): given an array of Solr response data, * construct an appropriate record driver object. * * @param array $data Solr data * * @return \VuFind\RecordDriver\AbstractBase */ - protected static function initRecordDriver($data) + protected function initRecordDriver($data) { $driver = new \VuFind\RecordDriver\SolrAuth(); $driver->setRawData($data); diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Results.php b/module/VuFind/src/VuFind/Search/SolrReserves/Results.php index f4115e5c802d0cbad8c7c6acd110ba818d7ea9bd..b84b487999b62458dde1733f6b2bb61c5c719f0d 100644 --- a/module/VuFind/src/VuFind/Search/SolrReserves/Results.php +++ b/module/VuFind/src/VuFind/Search/SolrReserves/Results.php @@ -56,14 +56,14 @@ class Results extends \VuFind\Search\Solr\Results } /** - * Support method for _performSearch(): given an array of Solr response data, + * Support method for performSearch(): given an array of Solr response data, * construct an appropriate record driver object. * * @param array $data Solr data * * @return \VuFind\RecordDriver\Base */ - protected static function initRecordDriver($data) + protected function initRecordDriver($data) { $driver = new \VuFind\RecordDriver\SolrReserves(); $driver->setRawData($data); diff --git a/module/VuFind/src/VuFind/Search/Summon/Results.php b/module/VuFind/src/VuFind/Search/Summon/Results.php index 475de19a99663761e5c3be24d74b92180c8b00e5..d8cef08d7aee7e90c93ea068d4c44533b8c5d559 100644 --- a/module/VuFind/src/VuFind/Search/Summon/Results.php +++ b/module/VuFind/src/VuFind/Search/Summon/Results.php @@ -124,7 +124,7 @@ class Results extends BaseResults // Construct record drivers for all the items in the response: $this->results = array(); foreach ($this->rawResponse['documents'] as $current) { - $this->results[] = self::initRecordDriver($current); + $this->results[] = $this->initRecordDriver($current); } } @@ -145,18 +145,18 @@ class Results extends BaseResults 'Record ' . $id . ' does not exist.' ); } - return static::initRecordDriver($record['documents'][0]); + return $this->initRecordDriver($record['documents'][0]); } /** - * Support method for _performSearch(): given an array of Solr response data, + * Support method for performSearch(): given an array of Summon response data, * construct an appropriate record driver object. * * @param array $data Raw record data * * @return \VuFind\RecordDriver\Base */ - protected static function initRecordDriver($data) + protected function initRecordDriver($data) { $driver = new \VuFind\RecordDriver\Summon(); $driver->setRawData($data); diff --git a/module/VuFind/src/VuFind/Search/WorldCat/Results.php b/module/VuFind/src/VuFind/Search/WorldCat/Results.php index 3bc637c3efce642deb3465b2a89f0cdf6ebd760e..a3890f1066450c73b962d3b0e42f7840ca5e3d03 100644 --- a/module/VuFind/src/VuFind/Search/WorldCat/Results.php +++ b/module/VuFind/src/VuFind/Search/WorldCat/Results.php @@ -90,7 +90,7 @@ class Results extends BaseResults && count($this->rawResponse->records->record) > 0 ) { foreach ($this->rawResponse->records->record as $current) { - $this->results[] = static::initRecordDriver( + $this->results[] = $this->initRecordDriver( $current->recordData->record->asXML() ); } @@ -114,18 +114,18 @@ class Results extends BaseResults 'Record ' . $id . ' does not exist.' ); } - return static::initRecordDriver($record); + return $this->initRecordDriver($record); } /** - * Support method for _performSearch(): given an array of Solr response data, + * Support method for performSearch(): given a WorldCat MARC record, * construct an appropriate record driver object. * - * @param array $data Raw record data + * @param string $data Raw record data * * @return \VuFind\RecordDriver\Base */ - protected static function initRecordDriver($data) + protected function initRecordDriver($data) { $driver = new \VuFind\RecordDriver\WorldCat(); $driver->setRawData($data);