generate an etag for shownotice

[quix0rs-gnu-social.git] / actions / tag.php

diff --git a/actions/tag.php b/actions/tag.php
index 8a3b8eaeb3af61a42f943f8cad377af7a826177d..034072a6bff405ab2ef4c168425e58f257c5f5be 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 define('TAGS_PER_PAGE', 100);
-define('AGE_FACTOR', 864000.0);
 
 class TagAction extends StreamAction {
 
@@ -49,7 +48,7 @@ class TagAction extends StreamAction {
        }
 
        function show_header($tag = false) {
-               if (false && $tag) {
+               if ($tag) {
                        common_element('link', array('rel' => 'alternate',
                                                                                 'href' => common_local_url('tagrss', array('tag' => $tag)),
                                                                                 'type' => 'application/rss+xml',
@@ -68,29 +67,29 @@ class TagAction extends StreamAction {
                        common_element_start('div', 'instructions');
                        common_raw($output);
                        common_element_end('div');
+                       $this->public_views_menu();
                }
-
-               common_element_start('ul', array('id' => 'nav_views'));
-
-               common_menu_item(common_local_url('tags'),
-                                                _('Recent Tags'),
-                                                _('Recent Tags'),
-                                                !$tag);
-               if ($tag) {
-                       common_menu_item(common_local_url('tag', array('tag' => $tag)),
-                                                        '#' . $tag,
-                                                        sprintf(_("Notices tagged with %s"), $tag),
-                                                        true);
-               }
-               common_element_end('ul');
        }
 
        function show_tags()
        {
                # This should probably be cached rather than recalculated
                $tags = DB_DataObject::factory('Notice_tag');
+
+               #Need to clear the selection and then only re-add the field
+               #we are grouping by, otherwise it's not a valid 'group by'
+               #even though MySQL seems to let it slide...
+               $tags->selectAdd();
+               $tags->selectAdd('tag');
+
+               #Add the aggregated columns...
                $tags->selectAdd('max(notice_id) as last_notice_id');
-               $tags->selectAdd(sprintf('sum(exp(-(now() - created)/%f)) as weight', AGE_FACTOR));
+               if(common_config('db','type')=='pgsql') {
+                       $calc='sum(exp(-extract(epoch from (now()-created))/%s)) as weight';
+               } else {
+                       $calc='sum(exp(-(now() - created)/%s)) as weight';
+               }
+               $tags->selectAdd(sprintf($calc, common_config('tag', 'dropoff')));
                $tags->groupBy('tag');
                $tags->orderBy('weight DESC');
 
@@ -110,6 +109,8 @@ class TagAction extends StreamAction {
                                $sum += $tags->weight;
                        }
 
+                       ksort($tw);
+                       
                        foreach ($tw as $tag => $weight) {
                                $this->show_tag($tag, $weight, $weight/$sum);
                        }
@@ -145,33 +146,20 @@ class TagAction extends StreamAction {
 
        function show_notices($tag) {
 
-               $tags = DB_DataObject::factory('Notice_tag');
-
-               $tags->tag = $tag;
-
-               $tags->orderBy('created DESC');
-
+               $cnt = 0;
+               
                $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               $tags->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-               $cnt = $tags->find();
+               $notice = Notice_tag::getStream($tag, (($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-               if ($cnt > 0) {
+               if ($notice) {
                        common_element_start('ul', array('id' => 'notices'));
-                       for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-                               if ($tags->fetch()) {
-                                       $notice = new Notice();
-                                       $notice->id = $tags->notice_id;
-                                       $result = $notice->find(true);
-                                       if (!$result) {
-                                               continue;
-                                       }
-                                       $this->show_notice($notice);
-                               } else {
-                                       // shouldn't happen!
+                       while ($notice->fetch()) {
+                               $cnt++;
+                               if ($cnt > NOTICES_PER_PAGE) {
                                        break;
                                }
+                               $this->show_notice($notice);
                        }
                        common_element_end('ul');
                }