From 8e66e5aa6c0f7b0763204973ca4cf9b8c660d657 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 22 Oct 2012 14:03:51 -0400
Subject: [PATCH] Renamed worldcatutils service to VuFind\WorldCatUtils.
---
module/VuFind/config/module.config.php | 2 +-
module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php | 3 ++-
module/VuFind/src/VuFind/Recommend/WorldCatTerms.php | 3 ++-
module/VuFind/src/VuFind/Related/Editions.php | 2 +-
module/VuFind/src/VuFind/Related/WorldCatEditions.php | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 55d55886d3f..c555ad3c36b 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -323,7 +323,7 @@ $config = array(
'VuFind\SessionManager' => 'Zend\Session\SessionManager',
'VuFind\SMS' => 'VuFind\Mailer\SMS',
'VuFind\WorldCatConnection' => 'VuFind\Connection\WorldCat',
- 'worldcatutils' => 'VuFind\Connection\WorldCatUtils',
+ 'VuFind\WorldCatUtils' => 'VuFind\Connection\WorldCatUtils',
),
'initializers' => array(
array('VuFind\ServiceManager\Initializer', 'initInstance'),
diff --git a/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php b/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php
index 86369a457c7..3bf0c5d7f48 100644
--- a/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php
+++ b/module/VuFind/src/VuFind/Recommend/WorldCatIdentities.php
@@ -105,7 +105,8 @@ class WorldCatIdentities extends AbstractSearchManagerAwareModule
$lookfor = isset($search[0]['lookfor']) ? $search[0]['lookfor'] : '';
// Get terminology information:
- return $this->getServiceLocator()->getServiceLocator()->get('WorldCatUtils')
+ return $this->getServiceLocator()->getServiceLocator()
+ ->get('VuFind\WorldCatUtils')
->getRelatedIdentities($lookfor);
}
}
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php b/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php
index 16ddd8da4ac..decab0b9fea 100644
--- a/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php
+++ b/module/VuFind/src/VuFind/Recommend/WorldCatTerms.php
@@ -106,7 +106,8 @@ class WorldCatTerms extends AbstractSearchManagerAwareModule
$lookfor = isset($search[0]['lookfor']) ? $search[0]['lookfor'] : '';
// Get terminology information:
- $wc = $this->getServiceLocator()->getServiceLocator()->get('WorldCatUtils');
+ $wc = $this->getServiceLocator()->getServiceLocator()
+ ->get('VuFind\WorldCatUtils');
$terms = $wc->getRelatedTerms($lookfor, $this->vocab);
// Wipe out any empty or unexpected sections of the related terms array;
diff --git a/module/VuFind/src/VuFind/Related/Editions.php b/module/VuFind/src/VuFind/Related/Editions.php
index 136706857e2..a1eed7414ff 100644
--- a/module/VuFind/src/VuFind/Related/Editions.php
+++ b/module/VuFind/src/VuFind/Related/Editions.php
@@ -102,7 +102,7 @@ class Editions extends AbstractServiceLocator
*/
protected function getQueryParts($driver)
{
- $wc = $this->getServiceLocator()->get('WorldCatUtils');
+ $wc = $this->getServiceLocator()->get('VuFind\WorldCatUtils');
$parts = array();
if (method_exists($driver, 'getCleanOCLCNum')) {
$oclcNum = $driver->getCleanOCLCNum();
diff --git a/module/VuFind/src/VuFind/Related/WorldCatEditions.php b/module/VuFind/src/VuFind/Related/WorldCatEditions.php
index 38bc297f150..7c6a243f24e 100644
--- a/module/VuFind/src/VuFind/Related/WorldCatEditions.php
+++ b/module/VuFind/src/VuFind/Related/WorldCatEditions.php
@@ -80,7 +80,7 @@ class WorldCatEditions extends Editions
*/
protected function getQueryParts($driver)
{
- $wc = $this->getServiceLocator()->get('WorldCatUtils');
+ $wc = $this->getServiceLocator()->get('VuFind\WorldCatUtils');
$parts = array();
if (method_exists($driver, 'getCleanISBN')) {
$isbn = $driver->getCleanISBN();
--
GitLab