More info for a proper, fancy-url lighttpd setup

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

diff --git a/plugins/Sitemap/Sitemap_notice_count.php b/plugins/Sitemap/Sitemap_notice_count.php
index 6e0061e97b083d5c07dd7ca7769f3a8e0fe49e06..9e523dfbc7dda8792af18c2c77633cd8d9119e31 100644 (file)
--- a/plugins/Sitemap/Sitemap_notice_count.php
+++ b/plugins/Sitemap/Sitemap_notice_count.php
@@ -51,76 +51,26 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  *
  * @see      DB_DataObject
  */
-
-class Sitemap_notice_count extends Memcached_DataObject
+class Sitemap_notice_count extends Managed_DataObject
 {
     public $__table = 'sitemap_notice_count'; // table name
 
     public $notice_date;                       // date primary_key not_null
     public $notice_count;                      // int(4)
-    public $created;
-    public $modified;
-
-    /**
-     * Get an instance by key
-     *
-     * This is a utility method to get a single instance with a given key value.
-     *
-     * @param string $k Key to use to lookup (usually 'notice_id' for this class)
-     * @param mixed  $v Value to lookup
-     *
-     * @return Sitemap_notice_count object found, or null for no hits
-     *
-     */
-
-    function staticGet($k, $v=null)
-    {
-        return Memcached_DataObject::staticGet('Sitemap_notice_count', $k, $v);
-    }
-
-    /**
-     * return table definition for DB_DataObject
-     *
-     * DB_DataObject needs to know something about the table to manipulate
-     * instances. This method provides all the DB_DataObject needs to know.
-     *
-     * @return array array of column definitions
-     */
+    public $created;                           // datetime()   not_null
+    public $modified;                          // datetime   not_null default_0000-00-00%2000%3A00%3A00
 
-    function table()
+    public static function schemaDef()
     {
-        return array('notice_date' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_NOTNULL,
-                     'notice_count' => DB_DATAOBJECT_INT,
-                     'created'   => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
-                     'modified'  => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
-    }
-
-    /**
-     * return key definitions for DB_DataObject
-     *
-     * DB_DataObject needs to know about keys that the table has; this function
-     * defines them.
-     *
-     * @return array key definitions
-     */
-
-    function keys()
-    {
-        return array('notice_date' => 'K');
-    }
-
-    /**
-     * return key definitions for Memcached_DataObject
-     *
-     * Our caching system uses the same key definitions, but uses a different
-     * method to get them.
-     *
-     * @return array key definitions
-     */
-
-    function keyTypes()
-    {
-        return $this->keys();
+        return array(
+            'fields' => array(
+                'notice_date' => array('type' => 'date', 'not null' => true, 'description' => 'record date'),
+                'notice_count' => array('type' => 'int', 'not null' => true, 'description' => 'the notice count'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('notice_date'),
+        );
     }
 
     static function getAll()
@@ -128,7 +78,6 @@ class Sitemap_notice_count extends Memcached_DataObject
         $noticeCounts = self::cacheGet('sitemap:notice:counts');
 
         if ($noticeCounts === false) {
-
             $snc = new Sitemap_notice_count();
             $snc->orderBy('notice_date DESC');
 
@@ -233,10 +182,11 @@ class Sitemap_notice_count extends Memcached_DataObject
 
     static function updateCount($d, $n)
     {
-        $snc = Sitemap_notice_count::staticGet('notice_date', DB_DataObject_Cast::date($d));
+        $snc = Sitemap_notice_count::getKV('notice_date', DB_DataObject_Cast::date($d));
 
         if (empty($snc)) {
-            throw new Exception("No such registration date: $d");
+            // TRANS: Exception
+            throw new Exception(_m("No such registration date: $d."));
         }
 
         $orig = clone($snc);