Changeset 2591 for trunk/workflow/inc/engine/src/common

Timestamp:

04/19/10 18:18:22 (14 years ago)

Author:

viani

Message:

Ticket #609 - Reconstrução da classe factory do workflow

Location:

trunk/workflow/inc/engine/src/common

Files:

• Base.php (modified) (3 diffs)
• WfRuntime.php (modified) (3 diffs)
• WfSecurity.php (modified) (4 diffs)

trunk/workflow/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;
   }
 

trunk/workflow/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::newInstance('BaseActivity');
     $this->activity =& $base_activity->getActivity($activity_id, $with_roles, $with_agents);
     if (!$this->activity)
@@ -1091 +1087 @@
     $workflow = $GLOBALS['workflow'];
     unset($_REQUEST['iid']);
-    $run_activity = CreateObject('workflow.run_activity');
+    $run_activity = Factory::getInstance('run_activity');
     $run_activity->runtime->instance->parentInstanceId = $this->instance_id;
     $run_activity->runtime->instance->parentActivityId = $this->activity_id;

trunk/workflow/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();
   }
 
@@ -58 +55 @@
       );
       //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);
@@ -78 +75 @@
   function checkUserAccess($user, $activity_id, $readonly=false) 
   {
+        /* if activity is non-interactive is not necessary checking user access */
+        $activity = &Factory::getInstance('BaseActivity')->getActivity($activity_id);
+        if (!$activity->isInteractive())
+                return true;
+
     //group mapping, warning groups and user can have the same id
     if ($user[0] != 'p')
@@ -577 +579 @@
       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);