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

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 569e93cb..cd7e08d0 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -134,7 +134,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,6 +150,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     
     function notifyEvent($event)
     {
+        print_r($event);
         //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
@@ -172,28 +173,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..
+                
+                
                 $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,13 +215,13 @@ 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;
             }
-            
+            //echo "inserting notify?";
             $n->act_start( date("Y-m-d H:i:s") );
             $n->insert();
             
@@ -217,6 +231,24 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         
         
     }
+    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();
+            
+            
+        }
+    }
     
      
 }