X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=3cd6f6566b9348e29728c2e2bd4ec996fa956b73;hb=3aea35aa0aae9ac0bb8f63851a4f14d63ec6a707;hp=ba602c5871e81db17a1bb28a5de6f1502b05fe92;hpb=27606f5baff63d63171654c5f2ef3e2feb81efdc;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index ba602c58..3cd6f656 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -20,6 +20,9 @@
  *        medium = "REVIEW" << eg. review needed..
  *        
  *
+ *  if onid == 0 then it will monitor all changes to that table..
+ *
+ *
  * 
  * 
  */
@@ -78,10 +81,20 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
      * Generate a notify event based on watches (matching whereAdd)
      *
      * Usage: $core_watch->notify('mtrack_repos', 1, false, date()
+     *
+     * This can match any 'event' type - eg. it can be blank etc...
+     *   Generally used by non-event driven notifications, like our
+     *   Daily commit message.
+     *
+     *  @param string $ontable - the database table that has been updated/changed etc.
+     *  @param int    $onid    - the id of the row changed
+     *  @param string  $whereAdd (optiona) - a DB whereAdd() condition to filter the search for watches
+     *  @param datetime    $when   (default now)  - date/time to create the notification for (Eg. end of day..)
+     * 
      */
     function notify($ontable , $onid, $whereAdd = false, $when=false)
     {
-        $w = DB_DataObject::factory('core_watch');
+        $w = DB_DataObject::factory('core_watch');   
         if ($whereAdd !== false) { 
             $w->whereAdd($whereAdd  );
         }
@@ -123,20 +136,16 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
      *
      * This get's called by roo->jok()
      *
+     * And searches for matching '$watch->event' == $event->action
+     *  along with id/table etc..
      *
      * it's basic usage is to fill in core_notify after an event has happend.
      *
      * We can also use it to notify other modules if something has happend.
      *  = eg. mtrack_ticket * watch will notify mtrack_jira::
      *
-     *  in that example:
-     *     public $ontable;                         // string(128)  not_null
-            public $onid;                            // int(11)  not_null
-            public $person_id;                       // int(11)  not_null
-            public $event;                           // string(128)  not_null
-            public $medium;                          // string(128)  not_null
-            public $active;                          // int(11)  not_null
-
+     * @param Pman_Core_DataObject_Events $event - the Pman event dataobject that was created
+     * 
      */
     
     function notifyEvent($event)
@@ -163,7 +172,7 @@ 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;
@@ -175,13 +184,23 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
                 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);
+                // the triggered method, can either do something
+                // or modify 
+                if ($do->{$dom[1]}($event, $n) !== false) {
+                    continue;
+                }
+                
                 
-                continue;
             }
             
             $n = clone($nn);
@@ -192,7 +211,7 @@ 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..
@@ -208,6 +227,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();
+            
+            
+        }
+    }
     
      
 }