'min' => 0,
'max' => 0,
),
- 'generate' => array(
- 'desc' => 'Generate notifications for a table, eg. cash_invoice',
- 'default' => '',
- 'short' => 'g',
- 'min' => 0,
- 'max' => 1,
+ /* removed - use GenerateNotifcations.php hooked classes
+ 'generate' => 'Generate notifications for a table, eg. cash_invoice',
+
),
+ */
'limit' => array(
'desc' => 'Limit search for no. to send to ',
'default' => 1000,
}
- function get($r,$opts)
+ function get($r,$opts=array())
{
$this->parseArgs($opts);
//date_default_timezone_set('UTC');
- // phpinfo();exit;
-
- $w = DB_DataObject::factory('core_notify_recur');
- if (is_a($w, 'DB_DataObject')) {
- $w->generateNotifications();
- }
- if (!empty($opts['generate'])) {
- $w = DB_DataObject::factory($opts['generate']);
- if (is_a($w, 'DB_DataObject')) {
- $w->generateNotifications();
- }
- exit;
-
-
- }
-
+ $this->generateNotifications();
+
+
//DB_DataObject::debugLevel(1);
$w = DB_DataObject::factory($this->table);
+ $total = 0;
if (!empty($opts['old'])) {
// show old and new...
$w->orderBy('act_when DESC'); // latest first
$w->limit($opts['limit']); // we can run
-
+ $total = min($w->count(), $opts['limit']);
} else {
// standard
}
$w->orderBy('act_when ASC'); // oldest first.
-
- $this->logecho("QUEUE is {$w->count()}");
+ $total = min($w->count(), $opts['limit']);
+ $this->logecho("QUEUE is {$w->count()} only running " . ((int) $opts['limit']));
$w->limit($opts['limit']); // we can run 1000 ...
}
}
$w->autoJoin();
+ $w->find();
-
- $ar = $w->fetchAll();
+ $ar = array(); // $w->fetchAll();
if (!empty($opts['list'])) {
- if (empty($ar)) {
- die("Nothing in Queue\n");
- }
- foreach($ar as $w) {
+
+
+ while ($w->fetch()) {
$o = $w->object();
- $this->logecho("$w->id : $w->person_id_email email : ".
+ $this->logecho("{$w->id} : {$w->person()->email} email : ".
$o->toEventString()." ". $w->status() );
}
exit;
$pushed = array();
$requeue = array();
while (true) {
+ if ($w->fetch()) {
+ $ar[] = clone($w);
+ $total--;
+ }
-
- $this->logecho("BATCH SIZE: ". count($ar) );
+ $this->logecho("BATCH SIZE: ". (count($ar) + $total) );
if (empty($ar)) {
- $this->logecho("COMPLETED MAIN QUEUE - running delated");
+ $this->logecho("COMPLETED MAIN QUEUE - running deleted");
if (empty($pushed)) {
break;
sleep(3);
continue;
}
- if ($this->poolHasDomain($p->person_id_email) > $this->max_to_domain) {
+ $email = $p->person() ? $p->person()->email : $p->to_email;
+
+ if ($this->poolHasDomain($email) > $this->max_to_domain) {
if ($pushed === false) {
// we only try once to requeue..
}
- $this->run($p->id,$p->person_id_email);
+ $this->run($p->id,$email);
exit;
}
+ function generateNotifications()
+ {
+ // this should check each module for 'GenerateNotifications.php' class..
+ //and run it if found..
+ $ff = HTML_FlexyFramework::get();
+
+ $disabled = explode(',', $ff->disable);
+
+ $modules = array_reverse($this->modulesList());
+
+ // move 'project' one to the end...
+
+ foreach ($modules as $module){
+ if(in_array($module, $disabled)){
+ continue;
+ }
+ $file = $this->rootDir. "/Pman/$module/GenerateNotifications.php";
+ if(!file_exists($file)){
+ continue;
+ }
+
+ require_once $file;
+ $class = "Pman_{$module}_GenerateNotifications";
+ $x = new $class;
+ if(!method_exists($x, 'generate')){
+ continue;
+ };
+ //echo "$module\n";
+ $x->generate($this);
+ }
+
+
+ }
+
+
+
function run($id, $email, $cmdOpts="")
{