From bdb9178af9aa218c102eeb4de94e71ab9ac70541 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Mon, 27 Aug 2012 14:37:52 -0400
Subject: [PATCH] Moved toArray to driver.
---
module/VuFind/src/VuFind/Controller/AdminController.php | 2 +-
module/VuFind/src/VuFind/Db/Table/UserStats.php | 2 +-
module/VuFind/src/VuFind/Statistics/Driver/Db.php | 2 +-
module/VuFind/src/VuFind/Statistics/Record.php | 3 +--
module/VuFind/src/VuFind/Statistics/Search.php | 3 +--
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/module/VuFind/src/VuFind/Controller/AdminController.php b/module/VuFind/src/VuFind/Controller/AdminController.php
index 7f1e79dd200..584c9d0f760 100644
--- a/module/VuFind/src/VuFind/Controller/AdminController.php
+++ b/module/VuFind/src/VuFind/Controller/AdminController.php
@@ -210,7 +210,7 @@ class AdminController extends AbstractBase
// Initialize browser/version data in view based on what we found above:
if ($matchFound) {
- $view->browserStats = $browserStats->toArray();
+ $view->browserStats = $browserStats;
$view->topVersions = $currentDriver->getBrowserStats(true, 5);
} else {
$view->browserStats = $view->topVersions = null;
diff --git a/module/VuFind/src/VuFind/Db/Table/UserStats.php b/module/VuFind/src/VuFind/Db/Table/UserStats.php
index e53ac0699c1..6bfb97334e0 100644
--- a/module/VuFind/src/VuFind/Db/Table/UserStats.php
+++ b/module/VuFind/src/VuFind/Db/Table/UserStats.php
@@ -96,6 +96,6 @@ class UserStats extends Gateway
$select->order('count DESC');
};
- return $this->select($callback);
+ return $this->select($callback)->toArray();
}
}
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Statistics/Driver/Db.php b/module/VuFind/src/VuFind/Statistics/Driver/Db.php
index 11fe0559951..69962432a53 100644
--- a/module/VuFind/src/VuFind/Statistics/Driver/Db.php
+++ b/module/VuFind/src/VuFind/Statistics/Driver/Db.php
@@ -93,7 +93,7 @@ class Db extends AbstractBase
public function getFullList($field, $value = array())
{
// Use the model
- return $this->statsTable->getFields($field, $value);
+ return $this->statsTable->getFields($field, $value)->toArray();
}
/**
diff --git a/module/VuFind/src/VuFind/Statistics/Record.php b/module/VuFind/src/VuFind/Statistics/Record.php
index 461cc447510..a5aaa54fa43 100644
--- a/module/VuFind/src/VuFind/Statistics/Record.php
+++ b/module/VuFind/src/VuFind/Statistics/Record.php
@@ -72,8 +72,7 @@ class Record extends AbstractBase
foreach ($this->drivers as $driver) {
$summary = $driver->getFullList('recordId');
if (!empty($summary)) {
- $summary = $summary->toArray();
- $sources = $driver->getFullList('recordSource')->toArray();
+ $sources = $driver->getFullList('recordSource');
$hashes = array();
// Generate hashes (faster than grouping by looping)
for ($i=0;$i<count($summary);$i++) {
diff --git a/module/VuFind/src/VuFind/Statistics/Search.php b/module/VuFind/src/VuFind/Statistics/Search.php
index 54ff03abf76..d6eefca84d8 100644
--- a/module/VuFind/src/VuFind/Statistics/Search.php
+++ b/module/VuFind/src/VuFind/Statistics/Search.php
@@ -74,8 +74,7 @@ class Search extends AbstractBase
foreach ($this->drivers as $driver) {
$summary = $driver->getFullList('phrase');
if (!empty($summary)) {
- $summary = $summary->toArray();
- $sources = $driver->getFullList('searchSource')->toArray();
+ $sources = $driver->getFullList('searchSource');
$hashes = array();
// Generate hashes (faster than grouping by looping)
for ($i=0;$i<count($summary);$i++) {
--
GitLab