From acea295db15d10e357b703e5524a4f355ee7f442 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 22 Oct 2012 13:51:42 -0400
Subject: [PATCH] Renamed recordloader service to VuFind\RecordLoader.
---
module/VuFind/config/module.config.php | 2 +-
module/VuFind/src/VuFind/Cart.php | 2 +-
module/VuFind/src/VuFind/Controller/AbstractBase.php | 2 +-
module/VuFind/src/VuFind/Db/Table/Resource.php | 2 +-
module/VuFind/src/VuFind/Search/Favorites/Results.php | 2 +-
module/VuFind/src/VuFind/Search/MixedList/Results.php | 2 +-
module/VuFind/src/VuFind/Search/Tags/Results.php | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 2c5931de6ca..00a7b9ad90c 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 2d2c9e0fb67..5f87c73b74a 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 7e7ac7bfe78..0c036b440e4 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 1c047dcfeec..aca1f03a9c7 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 3a113508a18..9873bdfbc23 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 14f1d82c1da..60184a73c72 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 b319238addf..0d9c5c0cb68 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);
}
--
GitLab