cache user data for user sitemap

diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php
index 42cadaca7d9b116831e1d03b6ef15a834c5e6311..3e5ac4652534c277631b7d23cabb6179de767d8d 100644 (file)
--- a/plugins/Sitemap/usersitemap.php
+++ b/plugins/Sitemap/usersitemap.php
@@ -43,7 +43,8 @@ if (!defined('STATUSNET')) {
 
 class UsersitemapAction extends SitemapAction
 {
-    var $user = null;
+    var $users = null;
+    var $j     = 0;
 
     function prepare($args)
     {
@@ -61,37 +62,67 @@ class UsersitemapAction extends SitemapAction
         $d += 0;
         $i += 0;
 
-        $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP;
-        $limit  = SitemapPlugin::USERS_PER_MAP;
+        $this->users = $this->getUsers($y, $m, $d, $i);
+        $this->j     = 0;
+        return true;
+    }
 
-        $this->user = new User();
+    function nextUrl()
+    {
+        if ($this->j < count($this->users)) {
+            $nickname = $this->users[$this->j];
+            $this->j++;
+            return array(common_profile_url($nickname), null, null, null);
+        } else {
+            return null;
+        }
+    }
 
-        $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d);
+    function getUsers($y, $m, $d, $i)
+    {
+        $u = User::cacheGet("sitemap:user:$y:$m:$d:$i");
 
-        // XXX: estimates 1d == 24h, which screws up days
-        // with leap seconds (1d == 24h + 1s). Thankfully they're
-        // few and far between.
+        if ($u === false) {
 
-        $enddt   = common_sql_date(strtotime($begindt) + (24 * 60 * 60));
+            $user = new User();
 
-        $this->user->whereAdd("created >= '$begindt'");
-        $this->user->whereAdd("created <  '$enddt'");
+            $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d);
 
-        $this->user->orderBy('created');
+            // XXX: estimates 1d == 24h, which screws up days
+            // with leap seconds (1d == 24h + 1s). Thankfully they're
+            // few and far between.
 
-        $this->user->limit($offset, $limit);
+            $theend = strtotime($begindt) + (24 * 60 * 60);
+            $enddt  = common_sql_date($theend);
 
-        $this->user->find();
+            $user->selectAdd();
+            $user->selectAdd('nickname');
+            $user->whereAdd("created >= '$begindt'");
+            $user->whereAdd("created <  '$enddt'");
 
-        return true;
-    }
+            $user->orderBy('created');
 
-    function nextUrl()
-    {
-        if ($this->user->fetch()) {
-            return array(common_profile_url($this->user->nickname), null, null, null);
-        } else {
-            return null;
+            $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP;
+            $limit  = SitemapPlugin::USERS_PER_MAP;
+
+            $user->limit($offset, $limit);
+
+            $user->find();
+
+            while ($user->fetch()) {
+                $u[] = $user->nickname;
+            }
+
+            $c = Cache::instance();
+
+            if (!empty($c)) {
+                $c->set(Cache::key("sitemap:user:$y:$m:$d:$i"),
+                        $u,
+                        Cache::COMPRESSED,
+                        ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60)));
+            }
         }
+
+        return $u;
     }
 }