X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=7e4c3d7e6b73935af27b763102717d3599eef085;hb=191032fa1f55f5b56eb6f21fb43c82346ef8dbe9;hp=569e93cb46032474af2001a84feba17490d5cc1a;hpb=44ccfdf95f40ba0103e4136da57ccb29a2b7b556;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 569e93cb..7e4c3d7e 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * Table Definition for core_watch
@@ -47,12 +48,54 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     ###END_AUTOCODE
     /** make sure there is a watch for this user.. */
     
+    
+    function applyFilters($q,$au, $roo)
+    {
+        if (!empty($q['_list_actions'])) {
+            $this->listActions($roo,$q);
+        }
+        //die("apply filters");
+        if (!empty($q['_split_event_name'])) {
+            $this->selectAdd("
+                
+                substr( event, substring_index(event, '.')) as event_left,
+                substr( event, 0, substring_index(event, '.')) as event_right        
+                             
+            ");
+            
+            
+            
+        }
+        
+    }
+    function listActions($roo, $q) {
+        
+        //print_r($q);
+        $d = DB_DataObject::Factory($q['on_table']);
+        $ret = array();
+        
+        foreach(get_class_methods($d) as $m) {
+            //var_dump($m);
+            if (!preg_match('/^notify/', $m)) {
+                continue;
+            }
+            $ret[] = array(
+                'display_name' => preg_replace('/^notify/', '' , $m),
+                'name' => $q['on_table'] .':'. $m
+            );
+        }
+        $roo->jdata($ret);
+    }
+    
     /**
      *
      * Create a watch...
      *
      */
     
+    
+    
+    
     function ensureNotify(  $ontable, $onid, $person_id, $whereAdd)
     {
         //DB_DAtaObject::debugLevel(1);
@@ -134,7 +177,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     // static really...
     /**
      *
-     * This get's called by roo->jok()
+     * This get's called by roo->addEvent()
      *
      * And searches for matching '$watch->event' == $event->action
      *  along with id/table etc..
@@ -150,7 +193,8 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     
     function notifyEvent($event)
     {
-        //DB_DataObject::DebugLevel(1);
+        //print_r($event);
+       //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
         // this is very basic logic... -
@@ -172,28 +216,41 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
  
         $watches = $w->fetchAll();
         
-        //print_R($watches);exit;
+        //print_R($watches); //exit;
         
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;
         $nn->onid       = $event->on_id;
         
         foreach($watches as $watch) {
+            $n = clone($nn);
             if (!$watch->person_id) { // no people??? bugs in watch table
                 $dom = explode(':',$watch->medium);
                 if (count($dom) != 2) {
                     continue;
                 }
+                // in some scenarios (like watching for new articles)
+                // we need to create a core, notify on the medium..
+                // in which case we set the  set $nn->evtype = medium..
+                // in that case - just let the called method generate the notify..
+                
+                //print_R($dom);
                 $do = DB_DataObject::factory($dom[0]);
                 if (!method_exists($do,$dom[1])) {
                     continue;
                 }
-                $do->{$dom[1]}($event);
+                //echo "calling {$watch->medium}\n";
+                // the triggered method, can either do something
+                // or modify the notify event..
+                if ($do->{$dom[1]}($event, $n) !== false) {
+                    //echo "method did not return false?";
+                    continue;
+                }
+                
                 
-                continue;
             }
             
-            $n = clone($nn);
+            
             $n->trigger_person_id = $event->person_id;
             $n->trigger_event_id = $event->id;
             $n->person_id = $watch->person_id;
@@ -201,22 +258,38 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             
             // does this watch already have a flag...
             $nf = clone($n);
-            $nf->whereAdd("sent ><'2000-01-01'");
+            $nf->whereAdd("sent < '2000-01-01'");
             //$nf->whereAdd('sent < act_when');
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;
             }
-            
-            $n->act_start( date("Y-m-d H:i:s") );
+            //echo "inserting notify?";
+            $n->act_start( empty($n->act_start) ? date("Y-m-d H:i:s") : $n->act_start );
             $n->insert();
-            
-            
         }
         
         
         
     }
+    function initDatabase($roo, $data) {
+        foreach($data as $d) {
+            $dd = $d;
+            if (isset($dd['active'])) {
+                unset($dd['active']);
+            }
+            $t = DB_DataObject::Factory($this->tableName());
+            $t->setFrom($dd);
+            if ($t->find(true)) {
+                continue;
+            }
+            $t = DB_DataObject::Factory($this->tableName());
+            $t->setFrom($d);
+            $t->insert();
+            
+            
+        }
+    }
     
      
 }