From bcd2bcaa22ab8aed961b17a68d70d839a8569d3b Mon Sep 17 00:00:00 2001
From: Hugo Loza <hugo@colosa.com>
Date: Tue, 19 Apr 2011 15:07:20 -0400
Subject: [PATCH] BUG 6639 Fix Completed

Completed the changes made for GTBank related to Report Tables
---
 .../engine/classes/class.reportTables.php     | 26 ++++++++++---------
 workflow/engine/classes/model/ReportTable.php |  3 ++-
 .../processes/processes_ImportExisting.php    |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php
index 02d60a2da..02ac7b28c 100644
--- a/workflow/engine/classes/class.reportTables.php
+++ b/workflow/engine/classes/class.reportTables.php
@@ -91,9 +91,9 @@ class ReportTables
           $rs = $stmt->executeQuery( 'DROP TABLE IF EXISTS `' . $sTableName . '`');
           break;
         case 'mssql':
-          $rs = $stmt->executeQuery( "IF OBJECT_ID (N'" . $sTableName . "', N'U') IS NOT NULL 
+          $rs = $stmt->executeQuery( "IF OBJECT_ID (N'" . $sTableName . "', N'U') IS NOT NULL
 																		  DROP TABLE [" . $sTableName . "]");
-          break; 
+          break;
       }
     }
     catch (Exception $oError) {
@@ -184,7 +184,7 @@ class ReportTables
           }
           
           $rs = $stmt->executeQuery( $sQuery );
-        break;			
+        break;
 			
       }
     }
@@ -331,7 +331,7 @@ class ReportTables
                   }
                 }
                 $sQuery .= ')';
-                $rs = $stmt->executeQuery( $sQuery );  
+                $rs = $stmt->executeQuery( $sQuery );
               }
               else {
                 if (isset($aData[$sGrid])) {
@@ -366,7 +366,7 @@ class ReportTables
               }
               $oDataset->next();
             }
-          break;          
+          break;
 				
       }
     }
@@ -422,11 +422,13 @@ class ReportTables
     try {
       $oReportTable = new ReportTable();
       $aFields = $oReportTable->load($sRepTabUid);
-      $this->dropTable($aFields['REP_TAB_NAME'], $aFields['REP_TAB_CONNECTION']);
-      $oCriteria = new Criteria('workflow');
-      $oCriteria->add(ReportVarPeer::REP_TAB_UID, $sRepTabUid);
-      $oDataset = ReportVarPeer::doDelete($oCriteria);
-      $oReportTable->remove($sRepTabUid);
+      if(!(empty($aFields))){
+        $this->dropTable($aFields['REP_TAB_NAME'], $aFields['REP_TAB_CONNECTION']);
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->add(ReportVarPeer::REP_TAB_UID, $sRepTabUid);
+        $oDataset = ReportVarPeer::doDelete($oCriteria);
+        $oReportTable->remove($sRepTabUid);
+      }
     }
     catch (Exception $oError) {
       throw($oError);
@@ -764,7 +766,7 @@ class ReportTables
                     }
                   }
                   $sQuery .= ')';
-                  $rs =$stmt->executeQuery( $sQuery );                  
+                  $rs =$stmt->executeQuery( $sQuery );
                 }
               }
             }
@@ -800,7 +802,7 @@ class ReportTables
       G::LoadSystem($sDataBase);
       $oDataBase = new database();
       $bExists   = $oDataBase->reportTableExist();
-    } 
+    }
     return $bExists;
   }
   
diff --git a/workflow/engine/classes/model/ReportTable.php b/workflow/engine/classes/model/ReportTable.php
index 415c56258..98bdda7f5 100644
--- a/workflow/engine/classes/model/ReportTable.php
+++ b/workflow/engine/classes/model/ReportTable.php
@@ -93,7 +93,8 @@ class ReportTable extends BaseReportTable {
         return $aFields;
       }
       else {
-        throw( new Exception( "The row '$RepTabUid' in table ReportTable doesn't exist!" ));
+        //throw( new Exception( "The row '$RepTabUid' in table ReportTable doesn't exist!" ));
+        return array();
       }
     }
     catch (Exception $oError) {
diff --git a/workflow/engine/methods/processes/processes_ImportExisting.php b/workflow/engine/methods/processes/processes_ImportExisting.php
index ff8f6d37c..c9b7d34bc 100644
--- a/workflow/engine/methods/processes/processes_ImportExisting.php
+++ b/workflow/engine/methods/processes/processes_ImportExisting.php
@@ -73,7 +73,7 @@
  }
 
   // if there are duplicated groups render the group importing options
-  if($groupsDuplicated>0){
+  if((isset($groupsDuplicated))&&($groupsDuplicated>0)){
     $Fields['PRO_FILENAME']  = $filename;
     $Fields['PRO_PATH']  = $path;
     $Fields['IMPORT_OPTION']  = $option;