From f389cc394b4763b4f210227cc4231b7bd0728ad7 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 28 Aug 2012 12:31:41 -0400
Subject: [PATCH] Moved \VuFind\Summon class to a view helper; it was only
accessed in views, and using a helper makes template syntax cleaner.
---
.../VuFind/src/VuFind/{ => Theme/Root/Helper}/Summon.php | 9 +++++----
.../templates/RecordDriver/Summon/export-endnote.phtml | 4 ++--
.../templates/RecordDriver/Summon/export-refworks.phtml | 4 ++--
themes/root/theme.ini | 1 +
4 files changed, 10 insertions(+), 8 deletions(-)
rename module/VuFind/src/VuFind/{ => Theme/Root/Helper}/Summon.php (93%)
diff --git a/module/VuFind/src/VuFind/Summon.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Summon.php
similarity index 93%
rename from module/VuFind/src/VuFind/Summon.php
rename to module/VuFind/src/VuFind/Theme/Root/Helper/Summon.php
index ee8597a6515..1e73c76827b 100644
--- a/module/VuFind/src/VuFind/Summon.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Summon.php
@@ -25,7 +25,8 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://www.vufind.org Main Page
*/
-namespace VuFind;
+namespace VuFind\Theme\Root\Helper;
+use Zend\View\Helper\AbstractHelper;
/**
* Summon support functions.
@@ -36,7 +37,7 @@ namespace VuFind;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://www.vufind.org Main Page
*/
-class Summon
+class Summon extends AbstractHelper
{
/**
* Export support function to convert Summon format to EndNote format.
@@ -45,7 +46,7 @@ class Summon
*
* @return string
*/
- public static function getEndnoteFormat($format)
+ public function getEndnoteFormat($format)
{
switch ($format) {
case 'Journal Article':
@@ -70,7 +71,7 @@ class Summon
*
* @return string
*/
- public static function getRefWorksFormat($format)
+ public function getRefWorksFormat($format)
{
switch ($format) {
case 'Book Chapter':
diff --git a/themes/root/templates/RecordDriver/Summon/export-endnote.phtml b/themes/root/templates/RecordDriver/Summon/export-endnote.phtml
index 3b8e2e3146f..11b49399f99 100644
--- a/themes/root/templates/RecordDriver/Summon/export-endnote.phtml
+++ b/themes/root/templates/RecordDriver/Summon/export-endnote.phtml
@@ -2,10 +2,10 @@
// Convert Summon formats to EndNote formats:
$formats = $this->driver->getFormats();
foreach ($formats as $i => $format) {
- $formats[$i] = \VuFind\Summon::getEndnoteFormat($format);
+ $formats[$i] = $this->summon()->getEndnoteFormat($format);
}
// Use the default template, but override the formats:
$this->overrideFormats = $formats;
-echo $this->render('RecordDriver/Base/export-endnote.phtml');
+echo $this->render('RecordDriver/AbstractBase/export-endnote.phtml');
?>
\ No newline at end of file
diff --git a/themes/root/templates/RecordDriver/Summon/export-refworks.phtml b/themes/root/templates/RecordDriver/Summon/export-refworks.phtml
index f11c4695055..621f324cf57 100644
--- a/themes/root/templates/RecordDriver/Summon/export-refworks.phtml
+++ b/themes/root/templates/RecordDriver/Summon/export-refworks.phtml
@@ -2,10 +2,10 @@
// Convert Summon formats to RefWorks formats:
$formats = $this->driver->getFormats();
foreach ($formats as $i => $format) {
- $formats[$i] = \VuFind\Summon::getRefWorksFormat($format);
+ $formats[$i] = $this->summon()->getRefWorksFormat($format);
}
// Use the default template, but override the formats:
$this->overrideFormats = $formats;
-echo $this->render('RecordDriver/Base/export-refworks.phtml');
+echo $this->render('RecordDriver/AbstractBase/export-refworks.phtml');
?>
\ No newline at end of file
diff --git a/themes/root/theme.ini b/themes/root/theme.ini
index e6f8267ec94..971c6c474eb 100644
--- a/themes/root/theme.ini
+++ b/themes/root/theme.ini
@@ -37,6 +37,7 @@ helpers_to_register[] = "Reviews"
helpers_to_register[] = "SearchOptions"
helpers_to_register[] = "SafeMoneyFormat"
helpers_to_register[] = "SortFacetList"
+helpers_to_register[] = "Summon"
helpers_to_register[] = "SyndeticsPlus"
helpers_to_register[] = "SystemEmail"
helpers_to_register[] = "TransEsc"
--
GitLab