Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / classes / File_to_post.php

diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index 1d84955129de73488413ac4c174acd27517fdffd..4c751ae4f399d78a70ad9266f4f89ee95540bea2 100644 (file)
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StatusNet - a distributed open-source microblogging tool
+ * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
@@ -25,7 +25,7 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
  * Table Definition for file_to_post
  */
 
-class File_to_post extends Memcached_DataObject
+class File_to_post extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -35,12 +35,29 @@ class File_to_post extends Memcached_DataObject
     public $post_id;                         // int(4)  primary_key not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_to_post',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of URL/file'),
+                'post_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the notice it belongs to'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('file_id', 'post_id'),
+            'foreign keys' => array(
+                'file_to_post_file_id_fkey' => array('file', array('file_id' => 'id')),
+                'file_to_post_post_id_fkey' => array('notice', array('post_id' => 'id')),
+            ),
+            'indexes' => array(
+                'file_id_idx' => array('file_id'),
+                'post_id_idx' => array('post_id'),
+            ),
+        );
+    }
+
     function processNew($file_id, $notice_id) {
         static $seen = array();
         if (empty($seen[$notice_id]) || !in_array($file_id, $seen[$notice_id])) {
@@ -52,6 +69,12 @@ class File_to_post extends Memcached_DataObject
                 $f2p->file_id = $file_id;
                 $f2p->post_id = $notice_id;
                 $f2p->insert();
+                
+                $f = File::getKV($file_id);
+
+                if (!empty($f)) {
+                    $f->blowCache();
+                }
             }
 
             if (empty($seen[$notice_id])) {
@@ -62,9 +85,12 @@ class File_to_post extends Memcached_DataObject
         }
     }
 
-    function &pkeyGet($kv)
+    function delete($useWhere=false)
     {
-        return Memcached_DataObject::pkeyGet('File_to_post', $kv);
+        $f = File::getKV('id', $this->file_id);
+        if ($f instanceof File) {
+            $f->blowCache();
+        }
+        return parent::delete($useWhere);
     }
 }
-