GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

fail gracefully when no IDs for tag cloud

Browse Source
This commit is contained in:
Evan Prodromou 2011-04-20 19:07:07 -04:00
parent 0c0aabeda5
commit 5899a3f5ee
2 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/inboxtagcloudsection.php
View File

@ -70,34 +70,38 @@ class InboxTagCloudSection extends TagCloudSection
$ids = $stream->getNoticeIds(0, Inbox::MAX_NOTICES, null, null); $ids = $stream->getNoticeIds(0, Inbox::MAX_NOTICES, null, null);
$weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff')); if (empty($ids)) {
// @fixme should we use the cutoff too? Doesn't help with indexing per-user. $tag = array();
$qry = 'SELECT notice_tag.tag, '.
$weightexpr . ' as weight ' .
'FROM notice_tag JOIN notice ' .
'ON notice_tag.notice_id = notice.id ' .
'WHERE notice.id in (' . implode(',', $ids) . ')'.
'GROUP BY notice_tag.tag ' .
'ORDER BY weight DESC ';
$limit = TAGS_PER_SECTION;
$offset = 0;
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else { } else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit; $weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
} // @fixme should we use the cutoff too? Doesn't help with indexing per-user.
$t = new Notice_tag(); $qry = 'SELECT notice_tag.tag, '.
$weightexpr . ' as weight ' .
'FROM notice_tag JOIN notice ' .
'ON notice_tag.notice_id = notice.id ' .
'WHERE notice.id in (' . implode(',', $ids) . ')'.
'GROUP BY notice_tag.tag ' .
'ORDER BY weight DESC ';
$t->query($qry); $limit = TAGS_PER_SECTION;
$offset = 0;
$tag = array(); if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
while ($t->fetch()) { $t = new Notice_tag();
$tag[] = clone($t);
$t->query($qry);
$tag = array();
while ($t->fetch()) {
$tag[] = clone($t);
}
} }
Memcached_DataObject::cacheSet($keypart, $tag, 3600); Memcached_DataObject::cacheSet($keypart, $tag, 3600);

50
lib/publictagcloudsection.php
View File

@ -71,34 +71,38 @@ class PublicTagCloudSection extends TagCloudSection
$ids = $stream->getNoticeIds(0, 500, null, null); $ids = $stream->getNoticeIds(0, 500, null, null);
$weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff')); if (empty($ids)) {
// @fixme should we use the cutoff too? Doesn't help with indexing per-user. $tag = array();
$qry = 'SELECT notice_tag.tag, '.
$weightexpr . ' as weight ' .
'FROM notice_tag JOIN notice ' .
'ON notice_tag.notice_id = notice.id ' .
'WHERE notice.id in (' . implode(',', $ids) . ')'.
'GROUP BY notice_tag.tag ' .
'ORDER BY weight DESC ';
$limit = TAGS_PER_SECTION;
$offset = 0;
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else { } else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit; $weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
} // @fixme should we use the cutoff too? Doesn't help with indexing per-user.
$t = new Notice_tag(); $qry = 'SELECT notice_tag.tag, '.
$weightexpr . ' as weight ' .
'FROM notice_tag JOIN notice ' .
'ON notice_tag.notice_id = notice.id ' .
'WHERE notice.id in (' . implode(',', $ids) . ') '.
'GROUP BY notice_tag.tag ' .
'ORDER BY weight DESC ';
$t->query($qry); $limit = TAGS_PER_SECTION;
$offset = 0;
$tag = array(); if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
while ($t->fetch()) { $t = new Notice_tag();
$tag[] = clone($t);
$t->query($qry);
$tag = array();
while ($t->fetch()) {
$tag[] = clone($t);
}
} }
Memcached_DataObject::cacheSet($keypart, $tag, 60 * 60 * 24); Memcached_DataObject::cacheSet($keypart, $tag, 60 * 60 * 24);