Changeset 3167 for branches/2.2/workflow/inc/class.JobScheduler.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.JobScheduler.inc.php (modified) (5 diffs)

branches/2.2/workflow/inc/class.JobScheduler.inc.php

@@ -11 +11 @@
 
 require_once 'jobs/class.JobEnum.inc.php';
-require_once 'jobs/class.AbsoluteDate.inc.php';
-require_once 'jobs/class.WeekDate.inc.php';
-require_once 'jobs/class.RelativeDate.inc.php';
 
 /**
@@ -57 +54 @@
         {
                 $this->currentDate = new DateTime(date('Y-n-j G:i:00'));
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
-                $this->jobManager = &$GLOBALS['workflow']['factory']->getInstance('WorkflowJobManager');
+                $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
+                $this->jobManager = &Factory::getInstance('WorkflowJobManager');
         }
 
@@ -76 +73 @@
                 {
                         case DateType::ABSOLUTE_DATE:
-                                $object = new AbsoluteDate($startDate, $interval);
+                                $object = &Factory::getInstance('AbsoluteDate', $startDate, $interval);
                                 break;
 
                         case DateType::WEEK_DATE:
-                                $object = new WeekDate($startDate, $interval);
+                                $object = &Factory::getInstance('WeekDate', $startDate, $interval);
                                 $object->setWeekDays($record['week_days']);
                                 break;
 
                         case DateType::RELATIVE_DATE:
-                                $object = new RelativeDate($startDate, $interval);
+                                $object = &Factory::getInstance('RelativeDate', $startDate, $interval);
                                 $object->setOffset($record['month_offset']);
                                 break;
@@ -171 +168 @@
                 $previousDir = getcwd();
                 chdir(GALAXIA_LIBRARY . '/../');
-                $output = $GLOBALS['workflow']['factory']->newInstance('Thread', 'class.JobRunner.inc.php "' . $parameters . '"');
+                $output = Factory::newInstance('Thread', 'class.JobRunner.inc.php "' . $parameters . '"');
                 chdir($previousDir);
                 return $output;
@@ -192 +189 @@
 {
         require_once 'common.inc.php';
-        $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();
+        Factory::getInstance('WorkflowMacro')->prepareEnvironment();
 
-        $job = new JobScheduler();
+        $job = Factory::newInstance('JobScheduler');
         $job->run();
 }