diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php index 2c5931de6cad7e618349efa6eb8231b2f7e36024..00a7b9ad90cd8ab48c5a1686634056ac9905c2b5 100644 --- a/module/VuFind/config/module.config.php +++ b/module/VuFind/config/module.config.php @@ -318,7 +318,7 @@ $config = array( 'VuFind\Cart' => 'VuFind\Cart', 'VuFind\CacheManager' => 'VuFind\Cache\Manager', 'VuFind\Mailer' => 'VuFind\Mailer', - 'recordloader' => 'VuFind\Record\Loader', + 'VuFind\RecordLoader' => 'VuFind\Record\Loader', 'searchspecsreader' => 'VuFind\Config\SearchSpecsReader', 'sessionmanager' => 'Zend\Session\SessionManager', 'sms' => 'VuFind\Mailer\SMS', diff --git a/module/VuFind/src/VuFind/Cart.php b/module/VuFind/src/VuFind/Cart.php index 2d2c9e0fb67aadbcd7fca306a560b03e76503550..5f87c73b74a9978b417d7301bb15c1e99cf25eb8 100644 --- a/module/VuFind/src/VuFind/Cart.php +++ b/module/VuFind/src/VuFind/Cart.php @@ -294,7 +294,7 @@ class Cart implements ServiceLocatorAwareInterface public function getRecordDetails() { return $this->getServiceLocator() - ->get('RecordLoader')->loadBatch($this->items); + ->get('VuFind\RecordLoader')->loadBatch($this->items); } /** diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php index 7e7ac7bfe78a9cd3c26e40da68ee6f686118f3d3..0c036b440e450742c902815ae66218eb2f3cb9cb 100644 --- a/module/VuFind/src/VuFind/Controller/AbstractBase.php +++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php @@ -206,7 +206,7 @@ class AbstractBase extends AbstractActionController */ public function getRecordLoader() { - return $this->getServiceLocator()->get('RecordLoader'); + return $this->getServiceLocator()->get('VuFind\RecordLoader'); } /** diff --git a/module/VuFind/src/VuFind/Db/Table/Resource.php b/module/VuFind/src/VuFind/Db/Table/Resource.php index 1c047dcfeeccebb9c434de3be813e4d528f5d1d2..aca1f03a9c7966550dc1f786ec65f74043b7d38e 100644 --- a/module/VuFind/src/VuFind/Db/Table/Resource.php +++ b/module/VuFind/src/VuFind/Db/Table/Resource.php @@ -80,7 +80,7 @@ class Resource extends Gateway // Load record if it was not provided: if (is_null($driver)) { $driver = $this->getServiceLocator()->getServiceLocator() - ->get('RecordLoader')->load($id, $source); + ->get('VuFind\RecordLoader')->load($id, $source); } // Load metadata into the database for sorting/failback purposes: diff --git a/module/VuFind/src/VuFind/Search/Favorites/Results.php b/module/VuFind/src/VuFind/Search/Favorites/Results.php index 3a113508a1846ced2d8b3c55b87707adc0eddb6e..9873bdfbc23789fcd89c929da95b5df1064207e2 100644 --- a/module/VuFind/src/VuFind/Search/Favorites/Results.php +++ b/module/VuFind/src/VuFind/Search/Favorites/Results.php @@ -168,7 +168,7 @@ class Results extends BaseResults ) ); } - $this->results = $this->getServiceLocator()->get('RecordLoader') + $this->results = $this->getServiceLocator()->get('VuFind\RecordLoader') ->loadBatch($recordsToRequest); } diff --git a/module/VuFind/src/VuFind/Search/MixedList/Results.php b/module/VuFind/src/VuFind/Search/MixedList/Results.php index 14f1d82c1da173a2b62eeaa915ea8cffe07f10fe..60184a73c72d23828667913c1a55bcda0d0b2580 100644 --- a/module/VuFind/src/VuFind/Search/MixedList/Results.php +++ b/module/VuFind/src/VuFind/Search/MixedList/Results.php @@ -62,7 +62,7 @@ class Results extends BaseResults protected function performSearch() { $recordsToRequest = $this->getParams()->getRecordsToRequest(); - $this->results = $this->getServiceLocator()->get('RecordLoader') + $this->results = $this->getServiceLocator()->get('VuFind\RecordLoader') ->loadBatch($recordsToRequest); $this->resultTotal = count($this->results); } diff --git a/module/VuFind/src/VuFind/Search/Tags/Results.php b/module/VuFind/src/VuFind/Search/Tags/Results.php index b319238addf70fc92ee4820d83f693455038adb0..0d9c5c0cb688a033cd072259977b88742a2fb001 100644 --- a/module/VuFind/src/VuFind/Search/Tags/Results.php +++ b/module/VuFind/src/VuFind/Search/Tags/Results.php @@ -73,7 +73,7 @@ class Results extends BaseResults $recordsToRequest[] = array('id' => $row->record_id, 'source' => $row->source); } - $this->results = $this->getServiceLocator()->get('RecordLoader') + $this->results = $this->getServiceLocator()->get('VuFind\RecordLoader') ->loadBatch($recordsToRequest); }