From 80cfdf781918d1609bfb169b79b7d980de1ab0de Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 7 Sep 2012 12:15:43 -0400
Subject: [PATCH] More static cleanup.
---
module/VuFind/src/VuFind/Search/Summon/Results.php | 6 +++---
module/VuFind/src/VuFind/Search/WorldCat/Results.php | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/module/VuFind/src/VuFind/Search/Summon/Results.php b/module/VuFind/src/VuFind/Search/Summon/Results.php
index d8cef08d7ae..50c2968f877 100644
--- a/module/VuFind/src/VuFind/Search/Summon/Results.php
+++ b/module/VuFind/src/VuFind/Search/Summon/Results.php
@@ -52,7 +52,7 @@ class Results extends BaseResults
*
* @return SummonConnection
*/
- public static function getSummonConnection()
+ public function getSummonConnection()
{
static $conn = false;
if (!$conn) {
@@ -78,7 +78,7 @@ class Results extends BaseResults
$finalSort = ($sort == 'relevance') ? null : $sort;
// Perform the actual search
- $summon = self::getSummonConnection();
+ $summon = $this->getSummonConnection();
$query = new SummonQuery(
$summon->buildQuery($this->getParams()->getSearchTerms()),
array(
@@ -138,7 +138,7 @@ class Results extends BaseResults
*/
public function getRecord($id)
{
- $summon = static::getSummonConnection();
+ $summon = $this->getSummonConnection();
$record = $summon->getRecord($id);
if (empty($record) || !isset($record['documents'][0])) {
throw new RecordMissingException(
diff --git a/module/VuFind/src/VuFind/Search/WorldCat/Results.php b/module/VuFind/src/VuFind/Search/WorldCat/Results.php
index a3890f10664..c1f1d1c8c3d 100644
--- a/module/VuFind/src/VuFind/Search/WorldCat/Results.php
+++ b/module/VuFind/src/VuFind/Search/WorldCat/Results.php
@@ -50,7 +50,7 @@ class Results extends BaseResults
*
* @return WorldCatConnection
*/
- public static function getWorldCatConnection()
+ public function getWorldCatConnection()
{
static $wc = false;
if (!$wc) {
@@ -69,7 +69,7 @@ class Results extends BaseResults
{
// Collect the search parameters:
$config = ConfigReader::getConfig();
- $wc = static::getWorldCatConnection();
+ $wc = $this->getWorldCatConnection();
$overrideQuery = $this->getParams()->getOverrideQuery();
$query = empty($overrideQuery)
? $wc->buildQuery($this->getParams()->getSearchTerms()) : $overrideQuery;
@@ -107,7 +107,7 @@ class Results extends BaseResults
*/
public function getRecord($id)
{
- $wc = static::getWorldCatConnection();
+ $wc = $this->getWorldCatConnection();
$record = $wc->getRecord($id);
if (empty($record)) {
throw new RecordMissingException(
--
GitLab