From f091519091cd3792728d77c3957e824e889fe360 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 13 Jul 2012 10:11:29 -0400
Subject: [PATCH] Implemented \VuFind\Db\Row\User::getTags().
---
module/VuFind/src/VuFind/Db/Row/Tags.php | 88 +++++++
module/VuFind/src/VuFind/Db/Row/User.php | 70 +++---
module/VuFind/src/VuFind/Db/Table/Tags.php | 266 +++++++++++++++++++++
3 files changed, 397 insertions(+), 27 deletions(-)
create mode 100644 module/VuFind/src/VuFind/Db/Row/Tags.php
create mode 100644 module/VuFind/src/VuFind/Db/Table/Tags.php
diff --git a/module/VuFind/src/VuFind/Db/Row/Tags.php b/module/VuFind/src/VuFind/Db/Row/Tags.php
new file mode 100644
index 00000000000..8c7b906432a
--- /dev/null
+++ b/module/VuFind/src/VuFind/Db/Row/Tags.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Row Definition for tags
+ *
+ * PHP version 5
+ *
+ * Copyright (C) Villanova University 2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @category VuFind2
+ * @package DB_Models
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org Main Site
+ */
+namespace VuFind\Db\Row;
+use Zend\Db\RowGateway\RowGateway;
+
+/**
+ * Row Definition for tags
+ *
+ * @category VuFind2
+ * @package DB_Models
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org Main Site
+ */
+class Tags extends RowGateway
+{
+ /**
+ * Constructor
+ *
+ * @param \Zend\Db\Adapter\Adapter $adapter Database adapter
+ */
+ public function __construct($adapter)
+ {
+ parent::__construct('id', 'tags', $adapter);
+ }
+
+ /**
+ * Get all resources associated with the current tag.
+ *
+ * @param string $source Record source (optional limiter)
+ * @param string $sort Resource field to sort on (optional)
+ *
+ * @return array
+ * @access public
+ */
+ public function getResources($source = null, $sort = null)
+ {
+ /* TODO
+ // Set up base query:
+ $table = new VuFind_Model_Db_ResourceTags();
+ $select = $table->select();
+ $select->setIntegrityCheck(false) // allow join
+ ->distinct()
+ ->from(array('r' => 'resource'), 'r.*')
+ ->join(
+ array('rt' => 'resource_tags'),
+ 'r.id = rt.resource_id',
+ array()
+ )
+ ->where('rt.tag_id = ?', $this->id);
+
+ if (!empty($source)) {
+ $select->where('r.source = ?', $source);
+ }
+
+ if (!empty($sort)) {
+ VuFind_Model_Db_Resource::applySort($select, $sort);
+ }
+
+ return $table->fetchAll($select);
+ */
+ }
+}
diff --git a/module/VuFind/src/VuFind/Db/Row/User.php b/module/VuFind/src/VuFind/Db/Row/User.php
index dbe8bd277e6..128d1cb3eb3 100644
--- a/module/VuFind/src/VuFind/Db/Row/User.php
+++ b/module/VuFind/src/VuFind/Db/Row/User.php
@@ -26,7 +26,8 @@
* @link http://vufind.org Main Site
*/
namespace VuFind\Db\Row;
-use Zend\Db\RowGateway\RowGateway;
+use VuFind\Db\Table\Tags as TagsTable, Zend\Db\RowGateway\RowGateway,
+ Zend\Db\Sql\Expression, Zend\Db\Sql\Predicate\Predicate;
/**
* Row Definition for user
@@ -112,34 +113,49 @@ class User extends RowGateway
*/
public function getTags($resourceId = null, $listId = null, $source = 'VuFind')
{
- /* TODO
- $tagList = array();
+ $userId = $this->id;
+ $callback = function ($select) use ($userId, $resourceId, $listId, $source) {
+ $select->columns(
+ array(
+ 'id' => new Expression(
+ 'min(?)', array('tags.id'),
+ array(Expression::TYPE_IDENTIFIER)
+ ),
+ 'tag',
+ 'cnt' => new Expression(
+ 'COUNT(?)', array('rt.id'),
+ array(Expression::TYPE_IDENTIFIER)
+ )
+ )
+ )
+ ->join(
+ array('rt' => 'resource_tags'), 'tags.id = rt.tag_id', array()
+ )
+ ->join(array('r' => 'resource'), 'rt.resource_id = r.id', array())
+ ->join(
+ array('ur' => 'user_resource'), 'r.id = ur.resource_id', array()
+ )
+ ->group(array('tag'))
+ ->order(array('tag'));
- $table = new VuFind_Model_Db_Tags();
- $select = $table->select();
- $select->setIntegrityCheck(false) // allow join
- ->from(
- array('t' => 'tags'),
- array('min(t.id)', 't.tag', 'cnt' => 'COUNT(rt.id)')
- )
- ->join(array('rt' => 'resource_tags'), 't.id = rt.tag_id', array())
- ->join(array('r' => 'resource'), 'rt.resource_id = r.id', array())
- ->join(array('ur' => 'user_resource'), 'r.id = ur.resource_id', array())
- ->where('ur.user_id = ?', $this->id)
- ->where('rt.user_id = ?', $this->id)
- ->where('ur.list_id = rt.list_id')
- ->where('r.source = ?', $source)
- ->group(array('t.tag'))
- ->order(array('t.tag'));
- if (!is_null($resourceId)) {
- $select->where('r.record_id = ?', $resourceId);
- }
- if (!is_null($listId)) {
- $select->where('rt.list_id = ?', $listId);
- }
+ $select->where->equalTo('ur.user_id', $userId)
+ ->equalTo('rt.user_id', $userId)
+ ->equalTo(
+ 'ur.list_id', 'rt.list_id',
+ Predicate::TYPE_IDENTIFIER, Predicate::TYPE_IDENTIFIER
+ )
+ ->equalTo('r.source', $source);
- return $table->fetchAll($select);
- */
+ if (!is_null($resourceId)) {
+ $select->where->equalTo('r.record_id', $resourceId);
+ }
+ if (!is_null($listId)) {
+ $select->where->equalTo('rt.list_id', $listId);
+ }
+ };
+
+ $table = new TagsTable();
+ return $table->select($callback);
}
/**
diff --git a/module/VuFind/src/VuFind/Db/Table/Tags.php b/module/VuFind/src/VuFind/Db/Table/Tags.php
new file mode 100644
index 00000000000..9bed8868034
--- /dev/null
+++ b/module/VuFind/src/VuFind/Db/Table/Tags.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * Table Definition for tags
+ *
+ * PHP version 5
+ *
+ * Copyright (C) Villanova University 2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @category VuFind2
+ * @package DB_Models
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org Main Site
+ */
+namespace VuFind\Db\Table;
+
+/**
+ * Table Definition for tags
+ *
+ * @category VuFind2
+ * @package DB_Models
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org Main Site
+ */
+class Tags extends Gateway
+{
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ parent::__construct('tags', 'VuFind\Db\Row\Tags');
+ }
+
+ /**
+ * Get the row associated with a specific tag string.
+ *
+ * @param string $tag Tag to look up.
+ * @param bool $create Should we create the row if it does not exist?
+ *
+ * @return Zend_Db_Table_Row|null Matching row if found or created, null
+ * otherwise.
+ */
+ public function getByText($tag, $create = true)
+ {
+ /* TODO
+ $select = $this->select();
+ $select->where('tag = ?', $tag);
+ $result = $this->fetchRow($select);
+ if (is_null($result) && $create) {
+ $result = $this->createRow();
+ $result->tag = $tag;
+ $result->save();
+ }
+ return $result;
+ */
+ }
+
+ /**
+ * Get the tags the match a string
+ *
+ * @param string $text Tag to look up.
+ *
+ * @return array of Zend_Db_Table_Row
+ */
+ public function matchText($text)
+ {
+ /* TODO
+ $select = $this->select();
+ $select->where('lower(tag) LIKE lower(?)', $text . '%');
+ $select->order('tag');
+ $result = $this->fetchAll($select);
+ return $result->toArray();
+ */
+ }
+
+ /**
+ * Get count of anonymous tags
+ *
+ * @return int count
+ */
+ public static function getAnonymousCount()
+ {
+ /* TODO
+ $resourceTagTable = new VuFind_Model_Db_ResourceTags();
+ $select = $resourceTagTable
+ ->select()
+ ->from(
+ array('resource_tags'),
+ array('cnt' => 'COUNT(*)')
+ )
+ ->where('user_id IS NULL');
+ $count = $resourceTagTable->fetchRow($select);
+ return $count['cnt'];
+ */
+ }
+
+ /**
+ * Get count of usage for a tag by id
+ *
+ * @param int $tag_id tag id
+ *
+ * @return int count
+ */
+ public function getCount($tag_id)
+ {
+ /* TODO
+ $resourceTagTable = new VuFind_Model_Db_ResourceTags();
+ $select = $resourceTagTable
+ ->select()
+ ->from(
+ array('resource_tags'),
+ array('cnt' => 'COUNT(*)')
+ )
+ ->where('tag_id = ?', $tag_id);
+ $count = $resourceTagTable->fetchRow($select);
+ return $count['cnt'];
+ */
+ }
+
+ /**
+ * Get tags associated with the specified resource.
+ *
+ * @param string $id Record ID to look up
+ * @param string $source Source of record to look up
+ * @param int $limit Max. number of tags to return (0 = no limit)
+ * @param int $list_id ID of list to load tags from (null for no restriction,
+ * true for on ANY list, false for on NO list)
+ * @param int $user_id ID of user to load tags from (null for all users)
+ * @param string $sort Sort type ('count' or 'tag')
+ *
+ * @return array
+ */
+ public function getForResource($id, $source = 'VuFind', $limit = 0,
+ $list_id = null, $user_id = null, $sort = 'count'
+ ) {
+ /* TODO
+ $select = $this->select();
+ $select->setIntegrityCheck(false) // allow join
+ ->from(
+ array('t' => $this->_name),
+ array('t.id', 't.tag', 'cnt' => 'COUNT(t.tag)')
+ )
+ ->join(array('rt' => 'resource_tags'), 't.id = rt.tag_id', array())
+ ->join(array('r' => 'resource'), 'rt.resource_id = r.id', array())
+ ->where('r.record_id = ?', $id)
+ ->where('r.source = ?', $source)
+ ->group(array('t.id', 't.tag'));
+
+ if ($sort == 'count') {
+ $select->order(array('cnt DESC', 't.tag'));
+ } else if ($sort == 'tag') {
+ $select->order(array('t.tag'));
+ }
+
+ if ($limit > 0) {
+ $select->limit($limit);
+ }
+ if ($list_id === true) {
+ $select->where('rt.list_id is not null');
+ } else if ($list_id === false) {
+ $select->where('rt.list_id is null');
+ } else if (!is_null($list_id)) {
+ $select->where('rt.list_id = ?', $list_id);
+ }
+ if (!is_null($user_id)) {
+ $select->where('rt.user_id = ?', $user_id);
+ }
+
+ return $this->fetchAll($select);
+ */
+ }
+
+ /**
+ * Get a list of tags based on a sort method ($sort)
+ *
+ * @param string $sort Sort/search parameter
+ * @param int $limit Maximum number of tags
+ * @param string $extra_where Additional select parameters
+ *
+ * @return array Tag details.
+ */
+ public function getTagList($sort, $limit = 100, $extra_where = '')
+ {
+ /* TODO
+ $tagList = array();
+ $select = $this->select();
+ $select->from(
+ array('tags'),
+ array('tags.tag', 'COUNT(resource_tags.id) AS cnt')
+ );
+ $select->join(
+ array('resource_tags'),
+ 'tags.id = resource_tags.tag_id',
+ array()
+ );
+ if (strlen($extra_where) > 0) {
+ $select->where($extra_where);
+ }
+ $select->group('tags.tag');
+ switch ($sort) {
+ case 'alphabetical':
+ $select->order(array('tags.tag', 'cnt DESC'));
+ break;
+ case 'popularity':
+ $select->order(array('cnt DESC', 'tags.tag'));
+ break;
+ case 'recent':
+ $select->order(
+ array('max(resource_tags.posted) DESC', 'cnt DESC', 'tags.tag')
+ );
+ break;
+ }
+ // Limit the size of our results based on the ini browse limit setting
+ $select->limit($limit);
+ $tags = $this->fetchAll($select);
+ foreach ($tags as $t) {
+ $tagList[] = array(
+ 'tag' => $t->tag,
+ 'cnt' => $t->cnt
+ );
+ }
+ return $tagList;
+ */
+ }
+
+ /**
+ * Delete a group of tags.
+ *
+ * @param array $ids IDs of tags to delete.
+ *
+ * @return void
+ */
+ public function deleteByIdArray($ids)
+ {
+ /* TODO
+ // Do nothing if we have no IDs to delete!
+ if (empty($ids)) {
+ return;
+ }
+
+ $db = $this->getAdapter();
+
+ $clauses = array();
+ foreach ($ids as $current) {
+ $clauses[] = $db->quoteInto('id = ?', $current);
+ }
+
+ $this->delete(implode(' OR ', $clauses));
+ */
+ }
+}
--
GitLab