Merge branch 'sitemap' into newmaster

[quix0rs-gnu-social.git] / plugins / Sitemap / noticesitemap.php

diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php
index 0024084863964c17e89991f55ebff65e83072e18..9f323f72aaa79ea766e5c60bdb19dbe0314d6616 100644 (file)
--- a/plugins/Sitemap/noticesitemap.php
+++ b/plugins/Sitemap/noticesitemap.php
@@ -43,9 +43,8 @@ if (!defined('STATUSNET')) {
 
 class NoticesitemapAction extends SitemapAction
 {
-    const NOTICES_PER_MAP = 25000;
-
-    var $notice = null;
+    var $notices = null;
+    var $j = 0;
 
     function prepare($args)
     {
@@ -63,35 +62,76 @@ class NoticesitemapAction extends SitemapAction
         $d += 0;
         $i += 0;
 
-        $offset = ($i-1) * self::NOTICES_PER_MAP;
-        $limit  = self::NOTICES_PER_MAP;
-
-        $this->notice = new Notice();
-
-        $dt = sprintf('%04d-%02d-%02d', $y, $m, $d);
-
-        $this->notice->whereAdd("created > '$dt 00:00:00'");
-        $this->notice->whereAdd("created <= '$dt 23:59:59'");
-
-        $this->notice->whereAdd('is_local != 0');
-
-        $this->notice->orderBy('id');
-        $this->notice->limit($offset, $limit);
-
-        $this->notice->find();
+        $this->notices = $this->getNotices($y, $m, $d, $i);
+        $this->j       = 0;
 
         return true;
     }
 
     function nextUrl()
     {
-        if ($this->notice->fetch()) {
-            return array(common_local_url('shownotice', array('notice' => $this->notice->id)),
-                         common_date_w3dtf($this->notice->created),
-                         null,
+        if ($this->j < count($this->notices)) {
+            $n = $this->notices[$this->j];
+            $this->j++;
+            return array(common_local_url('shownotice', array('notice' => $n[0])),
+                         common_date_w3dtf($n[1]),
+                         'never',
                          null);
         } else {
             return null;
         }
     }
+
+    function getNotices($y, $m, $d, $i)
+    {
+        $n = Notice::cacheGet("sitemap:notice:$y:$m:$d:$i");
+
+        if ($n === false) {
+
+            $notice = new Notice();
+
+            $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d);
+
+            // XXX: estimates 1d == 24h, which screws up days
+            // with leap seconds (1d == 24h + 1s). Thankfully they're
+            // few and far between.
+
+            $theend = strtotime($begindt) + (24 * 60 * 60);
+            $enddt  = common_sql_date($theend);
+
+            $notice->selectAdd();
+            $notice->selectAdd('id, created');
+
+            $notice->whereAdd("created >= '$begindt'");
+            $notice->whereAdd("created <  '$enddt'");
+
+            $notice->whereAdd('is_local != 0');
+
+            $notice->orderBy('created');
+
+            $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP;
+            $limit  = SitemapPlugin::NOTICES_PER_MAP;
+
+            $notice->limit($offset, $limit);
+
+            $notice->find();
+
+            $n = array();
+
+            while ($notice->fetch()) {
+                $n[] = array($notice->id, $notice->created);
+            }
+
+            $c = Cache::instance();
+
+            if (!empty($c)) {
+                $c->set(Cache::key("sitemap:notice:$y:$m:$d:$i"),
+                        $n,
+                        Cache::COMPRESSED,
+                        ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60)));
+            }
+        }
+
+        return $n;
+    }
 }