From 5899a3f5eed6224de4f7a72bef2fd500b8c87c8f Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 20 Apr 2011 19:07:07 -0400 Subject: [PATCH] fail gracefully when no IDs for tag cloud --- lib/inboxtagcloudsection.php | 50 +++++++++++++++++++---------------- lib/publictagcloudsection.php | 50 +++++++++++++++++++---------------- 2 files changed, 54 insertions(+), 46 deletions(-) diff --git a/lib/inboxtagcloudsection.php b/lib/inboxtagcloudsection.php index e41ee22a17..401983a9de 100644 --- a/lib/inboxtagcloudsection.php +++ b/lib/inboxtagcloudsection.php @@ -70,34 +70,38 @@ class InboxTagCloudSection extends TagCloudSection $ids = $stream->getNoticeIds(0, Inbox::MAX_NOTICES, null, null); - $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. - - $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; + if (empty($ids)) { + $tag = array(); } 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. + + $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 { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } - $t = new Notice_tag(); + $t = new Notice_tag(); - $t->query($qry); + $t->query($qry); - $tag = array(); + $tag = array(); - while ($t->fetch()) { - $tag[] = clone($t); + while ($t->fetch()) { + $tag[] = clone($t); + } } Memcached_DataObject::cacheSet($keypart, $tag, 3600); diff --git a/lib/publictagcloudsection.php b/lib/publictagcloudsection.php index 04cca16108..1d9dd0e751 100644 --- a/lib/publictagcloudsection.php +++ b/lib/publictagcloudsection.php @@ -71,34 +71,38 @@ class PublicTagCloudSection extends TagCloudSection $ids = $stream->getNoticeIds(0, 500, null, null); - $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. - - $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; + if (empty($ids)) { + $tag = array(); } 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. + + $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 { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } - $t = new Notice_tag(); + $t = new Notice_tag(); - $t->query($qry); + $t->query($qry); - $tag = array(); + $tag = array(); - while ($t->fetch()) { - $tag[] = clone($t); + while ($t->fetch()) { + $tag[] = clone($t); + } } Memcached_DataObject::cacheSet($keypart, $tag, 60 * 60 * 24); -- 2.39.5