From 0da6ffab1548231059e4af93437f69a7c7bc4f70 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 3 Jan 2012 12:42:00 -0800
Subject: [PATCH] Refactor upgrade scripts to better delete files and workflow
 activities.

---
 share/upgrades/7.10.23-8.0.0/removeAdminBar.pl         | 3 +--
 share/upgrades/7.10.23-8.0.0/removeFilePile.pl         | 3 +--
 share/upgrades/7.10.23-8.0.0/removeWebGUIStatistics.pl | 5 +++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/share/upgrades/7.10.23-8.0.0/removeAdminBar.pl b/share/upgrades/7.10.23-8.0.0/removeAdminBar.pl
index 636659247..9487d7597 100644
--- a/share/upgrades/7.10.23-8.0.0/removeAdminBar.pl
+++ b/share/upgrades/7.10.23-8.0.0/removeAdminBar.pl
@@ -42,7 +42,6 @@ done;
 
 start_step "Removing Admin Bar module";
 
-my $webgui_root = realpath( File::Spec->catdir( WebGUI::Paths->configBase, (File::Spec->updir) x 1) );
-unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Macro', 'AdminBar.pm');
+rm_lib('WebGUI::Macro::AdminBar');
 
 done;
diff --git a/share/upgrades/7.10.23-8.0.0/removeFilePile.pl b/share/upgrades/7.10.23-8.0.0/removeFilePile.pl
index 5715f70bf..f052bc98e 100644
--- a/share/upgrades/7.10.23-8.0.0/removeFilePile.pl
+++ b/share/upgrades/7.10.23-8.0.0/removeFilePile.pl
@@ -11,7 +11,6 @@ done;
 
 start_step "Removing FilePile asset module";
 
-my $webgui_root = realpath( File::Spec->catdir( WebGUI::Paths->configBase, (File::Spec->updir) x 1 ) );
-unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Asset', 'FilePile.pm');
+rm_lib('WebGUI::Asset::FilePile');
 
 done;
diff --git a/share/upgrades/7.10.23-8.0.0/removeWebGUIStatistics.pl b/share/upgrades/7.10.23-8.0.0/removeWebGUIStatistics.pl
index 9eed5221d..d67092bf6 100644
--- a/share/upgrades/7.10.23-8.0.0/removeWebGUIStatistics.pl
+++ b/share/upgrades/7.10.23-8.0.0/removeWebGUIStatistics.pl
@@ -7,12 +7,17 @@ start_step "Removing WebGUI statistics workflows and code";
 
 config->deleteFromHash( 'adminConsole', 'statistics' );
 
+report "Deleting Workflow Activities";
+my $activity = dbh->write(q|delete from WorkflowActivity where className='WebGUI::Workflow::Activity::SendWebguiStats'|);
+
+report "Deleting Workflow and Cron";
 my $workflow = WebGUI::Workflow->new(session, 'send_webgui_statistics');
 $workflow->delete;
 ##This may not be in there if it is not enabled.
 my $task = WebGUI::Workflow::Cron->new(session, 'send_webgui_statistics');
 $task && $task->delete;
 
+report "Deleting files";
 my $webgui_root = realpath( File::Spec->catdir( WebGUI::Paths->configBase, (File::Spec->updir) x 1 ) );
 unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Operation', 'Statistics.pm');
 unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Workflow', 'Activity', 'SendWebguiStats.pm');