X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=0f9b19f65dcf266709069fb322be1f9b88d77029;hp=0fe046bbfa0e445a7a2e1a89e3250525ac3aa2ba;hb=d5ef27157c6266fc33685d6d68f8304379f169ae;hpb=44061d6841ff579bed71a493ad2021371a238d8a diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php index 0fe046bb..0f9b19f6 100644 --- a/DataObjects/Core_watch.php +++ b/DataObjects/Core_watch.php @@ -1,3 +1,4 @@ + 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 toRooArraySingle($q) + { + die("here"); + + } + + 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); @@ -78,13 +131,28 @@ 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 ); } + $w->active =1; + + $w->whereAdd('onid = 0 OR onid='. ((int) $onid)); + + $w->ontable = $ontable; //$w->selectAdd(); //$w->selectAdd('distinct(person_id) as person_id'); @@ -103,7 +171,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject $nn->person_id = $w->person_id; $nf = clone($nn); - $nf->whereAdd("sent < '2000-01-01 or send is null'"); + $nf->whereAdd("sent < '2000-01-01'"); if ($nf->count()) { // we have a item in the queue for that waiting to be sent.. continue; @@ -116,27 +184,24 @@ 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.. * * 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: - * ublic $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) { - //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... - @@ -158,28 +223,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; @@ -187,22 +265,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(); + + + } + } }