From 9dd4d48ccb52bd796d1ad318d690978a7dff11b3 Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <erik@colosa.com>
Date: Mon, 10 Feb 2014 11:29:28 -0400
Subject: [PATCH] Updating flows Handling for Bpmn->workflow project Handling

---
 .../src/Services/Api/ProcessMaker/Project.php | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project.php b/workflow/engine/src/Services/Api/ProcessMaker/Project.php
index 9bcde680d..51153bb20 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project.php
@@ -116,25 +116,24 @@ class Project extends Api
              */
             $whiteList = array();
             foreach ($diagram["activities"] as $i => $activityData) {
-                $diagram["activities"][$i] = $activityData = array_change_key_case($activityData, CASE_UPPER);
+                $activityData = array_change_key_case($activityData, CASE_UPPER);
 
                 // activity exists ?
                 if ($activity = $bwp->getActivity($activityData["ACT_UID"])) {
                     // then update activity
                     $bwp->updateActivity($activityData["ACT_UID"], $activityData);
-
-                    $whiteList[] = $activityData["ACT_UID"];
                 } else {
                     // if not exists then create it
                     $oldActUid = $activityData["ACT_UID"];
                     $activityData["ACT_UID"] = Hash::generateUID();
-                    $diagram["activities"][$i]["ACT_UID"] = $activityData["ACT_UID"];
 
                     $bwp->addActivity($activityData);
 
                     $result[] = array("object" => "activity", "new_uid" => $activityData["ACT_UID"], "old_uid" => $oldActUid);
-                    $whiteList[] = $activityData["ACT_UID"];
+                    $diagram["activities"][$i] = $activityData;
                 }
+
+                $whiteList[] = $activityData["ACT_UID"];
             }
 
             $activities = $bwp->getActivities();
@@ -147,31 +146,30 @@ class Project extends Api
                 }
             }
 
+
             /*
              * Diagram's Gateways Handling
              */
             $whiteList = array();
             foreach ($diagram["gateways"] as $i => $gatewayData) {
-                $diagram["gateways"][$i] = $gatewayData = array_change_key_case($gatewayData, CASE_UPPER);
+                $gatewayData = array_change_key_case($gatewayData, CASE_UPPER);
 
                 // gateway exists ?
                 if ($gateway = $bwp->getGateway($gatewayData["GAT_UID"])) {
                     // then update activity
                     $bwp->updateGateway($gatewayData["GAT_UID"], $gatewayData);
-
-                    $whiteList[] = $gatewayData["GAT_UID"];
                 } else {
                     // if not exists then create it
                     $oldActUid = $gatewayData["GAT_UID"];
                     $gatewayData["GAT_UID"] = Hash::generateUID();
-                    Logger::log(" ==> updating gateway UID {$gatewayData["GAT_UID"]}->$oldActUid");
-                    $diagram["gateways"][$i]["GAT_UID"] = $gatewayData["GAT_UID"];
 
                     $bwp->addGateway($gatewayData);
 
                     $result[] = array("object" => "gateway", "new_uid" => $gatewayData["GAT_UID"], "old_uid" => $oldActUid);
-                    $whiteList[] = $gatewayData["GAT_UID"];
+                    $diagram["gateways"][$i] = $gatewayData;
                 }
+
+                $whiteList[] = $gatewayData["GAT_UID"];
             }
 
             $gateways = $bwp->getGateways();
@@ -198,8 +196,15 @@ class Project extends Api
                     $oldFloUid = $flowData["FLO_UID"];
                     $flowData["FLO_UID"] = Hash::generateUID();
 
-                    $flowData["FLO_ELEMENT_ORIGIN"] = self::mapUid($flowData["FLO_ELEMENT_ORIGIN"], $result);
-                    $flowData["FLO_ELEMENT_DEST"] = self::mapUid($flowData["FLO_ELEMENT_DEST"], $result);
+                    $mappedUid = self::mapUid($flowData["FLO_ELEMENT_ORIGIN"], $result) ;
+                    if ($mappedUid !== false) {
+                        $flowData["FLO_ELEMENT_ORIGIN"] = $mappedUid;
+                    }
+                    
+                    $mappedUid = self::mapUid($flowData["FLO_ELEMENT_DEST"], $result);
+                    if ($mappedUid !== false) {
+                        $flowData["FLO_ELEMENT_DEST"] = $mappedUid;
+                    }
 
                     $result[] = array("object" => "flow", "new_uid" => $flowData["FLO_UID"], "old_uid" => $oldFloUid);
                     $diagram["flows"][$i] = $flowData;
@@ -353,9 +358,7 @@ class Project extends Api
             }
         }
 
-        throw new \Exception("oldUid: $oldUid not found in list:".print_r($list, true));
-
-        return null;
+        return false;
     }
 }