Changeset 2311 for sandbox/workflow/branches/609/inc/engine

Timestamp:

03/19/10 17:22:08 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Migrando instanciação das classes da engine para a factory.

Location:

sandbox/workflow/branches/609/inc/engine

Files:

• config.ajax.inc.php (modified) (1 diff)
• src/API/BaseActivity.php (modified) (2 diffs)
• src/API/Instance.php (modified) (5 diffs)
• src/API/Process.php (modified) (1 diff)
• src/API/activities/Activity.php (modified) (1 diff)
• src/API/activities/End.php (modified) (1 diff)
• src/API/activities/Join.php (modified) (1 diff)
• src/API/activities/Split.php (modified) (1 diff)
• src/API/activities/Standalone.php (modified) (1 diff)
• src/API/activities/Start.php (modified) (1 diff)
• src/API/activities/SwitchActivity.php (modified) (1 diff)
• src/API/activities/View.php (modified) (1 diff)
• src/GUI/GUI.php (modified) (5 diffs)
• src/ProcessManager/ActivityManager.php (modified) (6 diffs)
• src/ProcessManager/BaseManager.php (modified) (1 diff)
• src/ProcessManager/InstanceManager.php (modified) (1 diff)
• src/ProcessManager/JobManager.php (modified) (1 diff)
• src/ProcessManager/ProcessManager.php (modified) (9 diffs)
• src/ProcessManager/RoleManager.php (modified) (1 diff)
• src/ProcessMonitor/ProcessMonitor.php (modified) (1 diff)
• src/common/Base.php (modified) (3 diffs)
• src/common/WfRuntime.php (modified) (2 diffs)
• src/common/WfSecurity.php (modified) (3 diffs)

sandbox/workflow/branches/609/inc/engine/config.ajax.inc.php

@@ -256 +256 @@
         function galaxia_get_config_values($parameters=array())
         {
-                        $config = new ajax_config();
+                        $config = &Factory::getInstance('ajax_config');
                         $config->read_repository();
 

sandbox/workflow/branches/609/inc/engine/src/API/BaseActivity.php

@@ -97 +97 @@
    * @access public
    */
-  function BaseActivity(&$db)
+  function BaseActivity()
   {
     $this->type='base';
     $this->child_name = 'BaseActivity';
-    parent::Base($db);
+    parent::Base();
   }
 
@@ -122 +122 @@
     if(!$result || !$result->numRows() ) return false;
     $res = $result->fetchRow();
+
     switch($res['wf_type']) {
       case 'start':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Start.php');
-        $act = new Start($this->db);  
-        break;
+        $act = &Factory::newInstance('Start');
+        break;
+
       case 'end':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'End.php');
-        $act = new End($this->db);
-        break;
+        $act = &Factory::newInstance('End');
+        break;
+
       case 'join':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Join.php');
-        $act = new Join($this->db);
-        break;
+        $act = &Factory::newInstance('Join');
+        break;
+
       case 'split':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Split.php');
-        $act = new Split($this->db);
-        break;
+        $act = &Factory::newInstance('Split');
+        break;
+
       case 'standalone':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Standalone.php');
-        $act = new Standalone($this->db);
-        break;
+        $act = &Factory::newInstance('Standalone');
+        break;
+
       case 'view':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'View.php');
-        $act = new View($this->db);
-        break;
+        $act = &Factory::newInstance('View');
+        break;
+
       case 'switch':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'SwitchActivity.php');
-        $act = new SwitchActivity($this->db);
-        break;
+        $act = &Factory::newInstance('SwitchActivity');
+        break;
+
       case 'activity':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Activity.php');
-        $act = new Activity($this->db);
-        break;
+        $act = &Factory::newInstance('Activity');
+        break;
+
       default:
         trigger_error('Unknown activity type:'.$res['wf_type'],E_USER_WARNING);
     }
-    
+
     $act->setName($res['wf_name']);
     $act->setProcessId($res['wf_p_id']);

sandbox/workflow/branches/609/inc/engine/src/API/Instance.php

@@ -1 +1 @@
 <?php
 require_once (GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'Base.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'common' . SEP . 'WfSecurity.php');
 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');
 
@@ -141 +140 @@
 
   var $activityID = null;
-  function Instance($db) 
+  function Instance() 
   {
     $this->child_name = 'Instance';
-    parent::Base($db);
+    parent::Base();
   }
 
@@ -1171 +1170 @@
     
     //lock rows and ensure access is granted
-    if (!(isset($this->security))) $this->security =& new WfSecurity($this->db); 
+    if (!(isset($this->security))) $this->security = &Factory::getInstance('WfSecurity', $this->db);
     if (!($this->security->checkUserAction($activityId,$this->instanceId,'complete')))
     {
@@ -1551 +1550 @@
     {
       //we check rights for this user on the next activity
-      if (!(isset($this->security))) $this->security =& new WfSecurity($this->db); 
+      if (!(isset($this->security))) $this->security = &Factory::getInstance('WfSecurity');
       if ($this->security->checkUserAccess($the_next_user,$activityId))
       {
@@ -1560 +1559 @@
     {
       // then check to see if there is a default user
-      $activity_manager =& new ActivityManager($this->db);
+      $activity_manager = &Factory::newInstance('ActivityManager');
       //get_default_user will give us '*' if there is no default_user or if the default user has no role
       //mapped anymore

sandbox/workflow/branches/609/inc/engine/src/API/Process.php

@@ -48 +48 @@
          * @access public
          */
-        function Process(&$db) 
+        function Process() 
         {
                 $this->child_name = 'Process';
-                parent::Base($db);
+                parent::Base();
         }
 

sandbox/workflow/branches/609/inc/engine/src/API/activities/Activity.php

@@ -16 +16 @@
          * @access public
          */
-        function Activity(&$db)
+        function Activity()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Activity';
         }

sandbox/workflow/branches/609/inc/engine/src/API/activities/End.php

@@ -15 +15 @@
          * @access public
          */
-        function End(&$db)
+        function End()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'End';
         }

sandbox/workflow/branches/609/inc/engine/src/API/activities/Join.php

@@ -15 +15 @@
          * @access public
          */
-        function Join(&$db)
+        function Join()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Join';
         }

sandbox/workflow/branches/609/inc/engine/src/API/activities/Split.php

@@ -15 +15 @@
          * @access public
          */
-        function Split(&$db)
+        function Split()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Split';
         }

sandbox/workflow/branches/609/inc/engine/src/API/activities/Standalone.php

@@ -15 +15 @@
          * @access public
          */
-        function Standalone(&$db)
+        function Standalone()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Standalone';
         }

sandbox/workflow/branches/609/inc/engine/src/API/activities/Start.php

@@ -15 +15 @@
          * @access public
          */
-        function Start(&$db)
+        function Start()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Start';
         }

sandbox/workflow/branches/609/inc/engine/src/API/activities/SwitchActivity.php

@@ -16 +16 @@
          * @access public
          */
-        function SwitchActivity(&$db)
+        function SwitchActivity()
         {
-           parent::Base($db);
+           parent::Base();
            $this->child_name = 'Switch';
         }

sandbox/workflow/branches/609/inc/engine/src/API/activities/View.php

@@ -16 +16 @@
          * @access public
          */     
-        function View(&$db)
+        function View()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'View';
         }

sandbox/workflow/branches/609/inc/engine/src/GUI/GUI.php

@@ -32 +32 @@
    * @access public
    */
-  function GUI(&$db) 
+  function GUI()
   {
     $this->child_name = 'GUI';
-    parent::Base($db);
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'WfSecurity.php');
-    $this->wf_security =& new WfSecurity($this->db); 
+    parent::Base();
+    $this->wf_security = &Factory::getInstance('WfSecurity');
   }
 
@@ -703 +702 @@
       if (!(isset($this->pm)))
       {
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ProcessManager.php');
-        $this->pm =& new ProcessManager($this->db);
+        $this->pm = &Factory::newInstance('ProcessManager');
       }
       $this->process_cache[$pId]['view'] = $this->pm->get_process_view_activity($pId);
@@ -871 +869 @@
     {
       //the security object said everything was fine
-      $instance = new Instance($this->db);
+      $instance = &Factory::newInstance('Instance');
       $instance->getInstance($instanceId);
       if (!empty($instance->instanceId)) 
@@ -975 +973 @@
     {
       //the security object said everything was fine
-      $instance =& new Instance($this->db);
+      $instance = &Factory::newInstance('Instance');
       $instance->getInstance($instanceId);
       // we force the execution of the activity
@@ -1012 +1010 @@
     {
       //the security object said everything was fine
-      $instance =& new Instance($this->db);
+      $instance = &Factory::newInstance('Instance');
       $instance->getInstance($instanceId);
       // we force the continuation of the flow

sandbox/workflow/branches/609/inc/engine/src/ProcessManager/ActivityManager.php

@@ -26 +26 @@
    * @access public
    */
-  function ActivityManager(&$db)
-  {
-    parent::BaseManager($db);
+  function ActivityManager()
+  {
+    parent::BaseManager();
     $this->child_name = 'ActivityManager';
     require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager' .SEP . 'ProcessManager.php');
@@ -370 +370 @@
   function build_process_graph($pId)
   {
-    if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);
+    if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager');
     $attributes = Array(
     
     );
-    $graph = new Process_GraphViz(true,$attributes);
+    $graph = &Factory::newInstance('Process_GraphViz', true, $attributes);
     $name = $this->process_manager->_get_normalized_name($pId);
     $graph->set_pid($name);
@@ -747 +747 @@
   {
     require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP . 'BaseActivity.php');
-    $act = new BaseActivity($this->db);
+    $act = &Factory::newInstance('BaseActivity');
     //Warning, we now use the BaseActivity object for it, interactivity and autorouting is now true/fales, not y/n
     return ($act->getActivity($activityId,false,true, true));
@@ -825 +825 @@
   function remove_activity($pId, $activityId, $transaction = true)
   {
-    if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);
+    if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager');
     $proc_info = $this->process_manager->get_process($pId);
     $actname = $this->_get_normalized_name($activityId);
@@ -888 +888 @@
   function replace_activity($pId, $activityId, $vars, $create_files=true)
   {
-    if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);
+    if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager');
     $TABLE_NAME = GALAXIA_TABLE_PREFIX.'activities';
     $now = date("U");
@@ -1195 +1195 @@
     elseif ( (!($result=='*')) && $performAccessCheck)
     {
-      $wf_security = new WfSecurity($this->db);
+      $wf_security = &Factory::getInstance('WfSecurity', $this->db);
       // perform the check
       if (!($wf_security->checkUserAccess($result,$activityId)))

sandbox/workflow/branches/609/inc/engine/src/ProcessManager/BaseManager.php

@@ -18 +18 @@
    * @access public
    */
-  function BaseManager(&$db)
+  function BaseManager()
   {
     $this->child_name = 'BaseManager';
-    parent::Base($db);
+    parent::Base();
   }
 

sandbox/workflow/branches/609/inc/engine/src/ProcessManager/InstanceManager.php

@@ -16 +16 @@
    * @access public
    */
-  function InstanceManager(&$db) 
-  {
-    parent::BaseManager($db);
+  function InstanceManager() 
+  {
+    parent::BaseManager();
     $this->child_name = 'InstanceManager';
   }

sandbox/workflow/branches/609/inc/engine/src/ProcessManager/JobManager.php

@@ -76 +76 @@
          * @access public
          */
-        public function JobManager(&$db)
-        {
-                parent::BaseManager($db);
+        public function JobManager()
+        {
+                parent::BaseManager();
                 $this->child_name = 'JobManager';
 
                 $this->jobTable = GALAXIA_TABLE_PREFIX . 'jobs';
                 $this->logTable = GALAXIA_TABLE_PREFIX . 'job_logs';
-                $this->processManager = new ProcessManager($this->db);
+                $this->processManager = &Factory::newInstance('ProcessManager');
         }
 

sandbox/workflow/branches/609/inc/engine/src/ProcessManager/ProcessManager.php

@@ -66 +66 @@
          * @access public
          */
-        function ProcessManager(&$db)
-        {
-                parent::BaseManager($db);
+        function ProcessManager()
+        {
+                parent::BaseManager();
                 $this->child_name = 'ProcessManager';
                 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ActivityManager.php');
@@ -131 +131 @@
         function serialize_process($pId)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 // <process>
                 $out = '<process>'."\n";
@@ -459 +459 @@
         {
                 //Now the show begins
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
-                if (!(isset($this->role_manager))) $this->role_manager = new RoleManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
+                if (!(isset($this->role_manager))) $this->role_manager = &Factory::newInstance('RoleManager');
                 if (!isset($this->jobManager))
-                        $this->jobManager = new JobManager($this->db);
+                        $this->jobManager = &Factory::newInstance('JobManager');
 
                 // First create the process. Always inactive and inactive first.
@@ -620 +620 @@
         function new_process_version($pId, $minor=true)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 $oldpid = $pId;
                 //retrieve process info with config rows
@@ -671 +671 @@
                 }
                 // create roles
-                if (!(isset($this->role_manager))) $this->role_manager = new RoleManager($this->db);
+                if (!(isset($this->role_manager))) $this->role_manager = &Factory::newInstance('RoleManager');
                 $query = 'select * from '.GALAXIA_TABLE_PREFIX.'roles where wf_p_id=?';
                 $result = $this->query($query, array($oldpid));
@@ -853 +853 @@
         function remove_process($pId)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 if (!isset($this->jobManager))
-                        $this->jobManager = new JobManager($this->db);
+                        $this->jobManager = &Factory::newInstance('JobManager');
                 $this->deactivate_process($pId);
                 $name = $this->_get_normalized_name($pId);
@@ -919 +919 @@
         function replace_process($pId, &$vars, $create = true)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 $TABLE_NAME = GALAXIA_TABLE_PREFIX.'processes';
                 $now = date("U");
@@ -1296 +1296 @@
                 {
                         //Warning: this means you have to include the Process.php from the API
-                        $this->Process = new Process($this->db);
+                        $this->Process = &Factory::newInstance('Process');
                         $this->Process->getProcess($pId);
                         $result_array = $this->Process->getConfigValues($config_array);
@@ -1316 +1316 @@
         {
                 //Warning: this means you have to include the Process.php from the API
-                $this->Process = new Process($this->db);
+                $this->Process = &Factory::newInstance('Process');
                 $this->Process->getProcess($pId);
                 $this->Process->setConfigValues($config_array);

sandbox/workflow/branches/609/inc/engine/src/ProcessManager/RoleManager.php

@@ -19 +19 @@
    * @access public
    */
-  function RoleManager(&$db) 
-  {
-    parent::Base($db);
+  function RoleManager() 
+  {
+    parent::Base();
     $this->child_name = 'RoleManager';
   }

sandbox/workflow/branches/609/inc/engine/src/ProcessMonitor/ProcessMonitor.php

@@ -18 +18 @@
    * @access public
    */
-  function ProcessMonitor(&$db)
+  function ProcessMonitor()
   {
     $this->child_name = 'ProcessMonitor';
-    parent::Base($db);
+    parent::Base();
     // check the the actual user can really do this
     if ( !(galaxia_user_can_monitor()))

sandbox/workflow/branches/609/inc/engine/src/common/Base.php

@@ -39 +39 @@
         var $child_name = 'Base';
 
+        /**
+         * @var object $db_shared_obj The database abstraction object shared between
+         *                                                    all instances of this class.
+         * @acess private
+         * @static
+         */
+        private static $db_shared_obj = null;
+
   /**
    * Constructor receiving a database abstraction object
@@ -46 +54 @@
    * @access public
    */
-  function Base(&$db)
+  function Base()
   {
-    if(!$db) {
+        /**
+         * New Stuff!
+         * We decided to get here the database object. In a recent past,
+         * all the classes that specialize this one passed a db object.
+         * Now, to simplify and save memory, we store the database object
+         * into a single and static atribute shared among each instance
+         * of this class.
+         *
+         * To prevent to modify all sub-classes to use "self::$db" instead
+         * of "this->db", we made a very tiny workaround here. In the first
+         * instantiation of this class, we instantiate the database object
+         * and store it into 'self::$db_shared_obj'. Any subsequent
+         * instantiations will just point to the static one.
+         */
+        if (!self::$db_shared_obj)
+                self::$db_shared_obj = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
+
+        $this->db = &self::$db_shared_obj;
+
+
+    if(!$this->db) {
       die('Invalid db object passed to '.$this->child_name.' constructor');
     }
     //Force transactionnal mysql (Innodb) -> mysqlt
-    if ($db->databaseType=='mysql')
+    if ($this->db->databaseType=='mysql')
     {
         $GLOBALS['phpgw']->db->disconnect();
-        $db = $GLOBALS['phpgw']->db->connect(
+        $this->db = $GLOBALS['phpgw']->db->connect(
                         $GLOBALS['phpgw_info']['server']['db_name'],
                         $GLOBALS['phpgw_info']['server']['db_host'],
@@ -64 +92 @@
                 );
     }
-    $this->db = &$db;
   }
 

sandbox/workflow/branches/609/inc/engine/src/common/WfRuntime.php

@@ -86 +86 @@
    * @access public
    */
-  function WfRuntime(&$db) 
+  function WfRuntime() 
   {
     $this->child_name = 'WfRuntime';
-    parent::Base($db);
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'BaseActivity.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Process.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Instance.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'WfSecurity.php');
-    
+    parent::Base();
+
     //first the activity is not set
     $this->activity = null;
-    $this->instance = new Instance($this->db);
-    $this->process = new Process($this->db);
-    $this->security = new WfSecurity($this->db); 
+    $this->instance = &Factory::newInstance('Instance');
+    $this->process = &Factory::newInstance('Process');
+    $this->security = &Factory::getInstance('WfSecurity');
   }
 
@@ -276 +272 @@
       return false;
     }
-    $base_activity = new BaseActivity($this->db);
+    $base_activity = &Factory::getInstance('BaseActivity', $this->db);
     $this->activity =& $base_activity->getActivity($activity_id, $with_roles, $with_agents);
     if (!$this->activity)

sandbox/workflow/branches/609/inc/engine/src/common/WfSecurity.php

@@ -23 +23 @@
    * @access public
    */
-  function WfSecurity(&$db) 
+  function WfSecurity() 
   {
     $this->child_name = 'WfSecurity';
-    parent::Base($db);
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Instance.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Process.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'BaseActivity.php');
+    parent::Base();
+
+        /* I'm not really sure if we can strip it out. */
+
+    //require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Instance.php');
+    //require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Process.php');
+    //require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'BaseActivity.php');
   }
 
@@ -58 +61 @@
       );
       //check theses values for this process and store the result for this object life duration
-      $myProcess = new Process($this->db);
+      $myProcess = &Factory::newInstance('Process');
       $myProcess->getProcess($pId);
       $this->processesConfig[$pId] = $myProcess->getConfigValues($arrayConf);
@@ -577 +580 @@
       if (!(isset($this->pm)))
       {
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ProcessManager.php');
-        $this->pm = new ProcessManager($this->db);
+        $this->pm = &Factory::newInstance('ProcessManager');
       }
       //$this->error[] = 'DEBUG: checking to see if there is no view activities on process :'.$pId.':'.$this->pm->get_process_view_activity($pId);