More info for a proper, fancy-url lighttpd setup

[quix0rs-gnu-social.git] / plugins / AnonymousFave / Fave_tally.php

diff --git a/plugins/AnonymousFave/Fave_tally.php b/plugins/AnonymousFave/Fave_tally.php
index f48a1e82b313f7cf5e342a650b2f3eb7f423c16e..c9fe181b6d5c5dea1b7aefb6c3f4251ff36567ec 100644 (file)
--- a/plugins/AnonymousFave/Fave_tally.php
+++ b/plugins/AnonymousFave/Fave_tally.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class Fave_tally extends Memcached_DataObject
+class Fave_tally extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -52,87 +52,28 @@ class Fave_tally extends Memcached_DataObject
     public $__table = 'fave_tally';          // table name
     public $notice_id;                       // int(4)  primary_key not_null
     public $count;                           // int(4)  not_null
+    public $created;                         // datetime()   not_null
     public $modified;                        // datetime   not_null default_0000-00-00%2000%3A00%3A00
 
-    /* Static get */
-    function staticGet($k, $v = NULL) { return Memcached_DataObject::staticGet('Fave_tally', $k, $v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    /**
-     * return table definition for DB_DataObject
-     *
-     * @return array array of column definitions
-     */
-
-    function table()
+    public static function schemaDef()
     {
         return array(
-            'notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-            'count'     => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-            'modified'  => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL
+            'fields' => array(
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice id'),
+                'count' => array('type' => 'int', 'not null' => true, 'description' => 'the fave tally 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_id'),
+            'foreign keys' => array(
+                'fave_tally_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+            ),
         );
     }
 
-    /**
-     * return key definitions for DB_DataObject
-     *
-     * DB_DataObject needs to know about keys that the table has, since it
-     * won't appear in StatusNet's own keys list. In most cases, this will
-     * simply reference your keyTypes() function.
-     *
-     * @return array list of key field names
-     */
-    function keys()
-    {
-        return array_keys($this->keyTypes());
-    }
-
-    /**
-     * return key definitions for Memcached_DataObject
-     *
-     * Our caching system uses the same key definitions, but uses a different
-     * method to get them. This key information is used to store and clear
-     * cached data, so be sure to list any key that will be used for static
-     * lookups.
-     *
-     * @return array associative array of key definitions, field name to type:
-     *         'K' for primary key: for compound keys, add an entry for each component;
-     *         'U' for unique keys: compound keys are not well supported here.
-     */
-    function keyTypes()
-    {
-        return array('notice_id' => 'K');
-    }
-
-    /**
-     * Magic formula for non-autoincrementing integer primary keys
-     *
-     * If a table has a single integer column as its primary key, DB_DataObject
-     * assumes that the column is auto-incrementing and makes a sequence table
-     * to do this incrementation. Since we don't need this for our class, we
-     * overload this method and return the magic formula that DB_DataObject needs.
-     *
-     * @return array magic three-false array that stops auto-incrementing.
-     */
-    function sequenceKey()
-    {
-        return array(false, false, false);
-    }
-
-    /**
-     * Get a single object with multiple keys
-     *
-     * @param array $kv Map of key-value pairs
-     *
-     * @return User_flag_profile found object or null
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Fave_tally', $kv);
-    }
-
     /**
      * Increment a notice's tally
      *
@@ -152,7 +93,7 @@ class Fave_tally extends Memcached_DataObject
             $msg = sprintf(
                 // TRANS: Server exception.
                 // TRANS: %d is the notice ID (number).
-                _m("Couldn't update favorite tally for notice ID %d."),
+                _m("Could not update favorite tally for notice ID %d."),
                 $noticeID
             );
             throw new ServerException($msg);
@@ -181,7 +122,7 @@ class Fave_tally extends Memcached_DataObject
                 $msg = sprintf(
                     // TRANS: Server exception.
                     // TRANS: %d is the notice ID (number).
-                    _m("Couldn't update favorite tally for notice ID %d."),
+                    _m("Could not update favorite tally for notice ID %d."),
                     $noticeID
                 );
                 throw new ServerException($msg);
@@ -201,7 +142,7 @@ class Fave_tally extends Memcached_DataObject
      */
     static function ensureTally($noticeID)
     {
-        $tally = Fave_tally::staticGet('notice_id', $noticeID);
+        $tally = Fave_tally::getKV('notice_id', $noticeID);
 
         if (!$tally) {
             $tally = new Fave_tally();
@@ -212,7 +153,7 @@ class Fave_tally extends Memcached_DataObject
                 $msg = sprintf(
                     // TRANS: Server exception.
                     // TRANS: %d is the notice ID (number).
-                    _m("Couldn't create favorite tally for notice ID %d."),
+                    _m("Could not create favorite tally for notice ID %d."),
                     $noticeID
                 );
                 throw new ServerException($msg);