From 616d5cc86658993c217f826828dd9313339a4378 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 7 Apr 2010 16:43:16 -0700 Subject: [PATCH] Moose overrides for purge, purgeRevision, and purgeCache. --- lib/WebGUI/Asset/Event.pm | 12 +++---- lib/WebGUI/Asset/File.pm | 18 +++++------ lib/WebGUI/Asset/File/GalleryFile.pm | 6 ++-- lib/WebGUI/Asset/MatrixListing.pm | 6 ++-- lib/WebGUI/Asset/Post.pm | 32 +++++++++---------- lib/WebGUI/Asset/Post/Thread.pm | 6 ++-- lib/WebGUI/Asset/Shortcut.pm | 6 ++-- lib/WebGUI/Asset/Sku/EMSBadge.pm | 6 ++-- lib/WebGUI/Asset/Sku/EMSRibbon.pm | 6 ++-- lib/WebGUI/Asset/Sku/EMSTicket.pm | 6 ++-- lib/WebGUI/Asset/Sku/EMSToken.pm | 6 ++-- lib/WebGUI/Asset/Sku/Product.pm | 18 +++++------ lib/WebGUI/Asset/Sku/ThingyRecord.pm | 6 ++-- lib/WebGUI/Asset/Snippet.pm | 6 ++-- lib/WebGUI/Asset/Story.pm | 12 +++---- lib/WebGUI/Asset/Wobject/Collaboration.pm | 12 +++---- .../Asset/Wobject/Collaboration/Newsletter.pm | 6 ++-- lib/WebGUI/Asset/Wobject/Dashboard.pm | 6 ++-- lib/WebGUI/Asset/Wobject/DataForm.pm | 6 ++-- .../Asset/Wobject/EventManagementSystem.pm | 6 ++-- lib/WebGUI/Asset/Wobject/Folder.pm | 6 ++-- lib/WebGUI/Asset/Wobject/HttpProxy.pm | 12 +++---- lib/WebGUI/Asset/Wobject/InOutBoard.pm | 6 ++-- lib/WebGUI/Asset/Wobject/Matrix.pm | 6 ++-- lib/WebGUI/Asset/Wobject/MessageBoard.pm | 6 ++-- lib/WebGUI/Asset/Wobject/MultiSearch.pm | 6 ++-- lib/WebGUI/Asset/Wobject/Poll.pm | 6 ++-- lib/WebGUI/Asset/Wobject/ProjectManager.pm | 13 -------- lib/WebGUI/Asset/Wobject/SQLReport.pm | 6 ++-- lib/WebGUI/Asset/Wobject/StockData.pm | 14 -------- lib/WebGUI/Asset/Wobject/Survey.pm | 19 ++--------- lib/WebGUI/Asset/Wobject/SyndicatedContent.pm | 6 ++-- lib/WebGUI/Asset/Wobject/Thingy.pm | 6 ++-- lib/WebGUI/Asset/Wobject/TimeTracking.pm | 13 -------- lib/WebGUI/Asset/Wobject/_NewWobject.skeleton | 6 ++-- lib/WebGUI/Asset/_NewAsset.skeleton | 12 +++---- 36 files changed, 139 insertions(+), 192 deletions(-) diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 1fd184515..6bb9b0da4 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -1752,7 +1752,7 @@ Extent the method from the super class to delete all storage locations. =cut -sub purge { +override purge => sub { my $self = shift; my $sth = $self->session->db->read("select storageId from Event where assetId=?",[$self->getId]); while (my ($storageId) = $sth->array) { @@ -1760,8 +1760,8 @@ sub purge { $storage->delete if defined $storage; } $sth->finish; - return $self->SUPER::purge; -} + return super(); +}; #------------------------------------------------------------------- @@ -1771,11 +1771,11 @@ Extent the method from the super class to delete the storage location for this r =cut -sub purgeRevision { +override purgeRevision => sub { my $self = shift; $self->getStorageLocation->delete; - return $self->SUPER::purgeRevision; -} + return super(); +}; #################################################################### diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index 151a6de30..bd054a450 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -420,15 +420,15 @@ Extends the master method to delete all storage locations associated with this a =cut -sub purge { +override purge => sub { my $self = shift; my $sth = $self->session->db->read("select storageId from FileAsset where assetId=".$self->session->db->quote($self->getId)); while (my ($storageId) = $sth->array) { $self->getStorageClass->get($self->session,$storageId)->delete; } $sth->finish; - return $self->SUPER::purge; -} + return super(); +}; #------------------------------------------------------------------- @@ -438,11 +438,11 @@ Extends the master method to clear the view cache. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; eval{$self->session->cache->delete("view_".$self->getId)}; - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- @@ -452,11 +452,11 @@ Extends the master method to delete the storage location for this asset. =cut -sub purgeRevision { +override purgeRevision => sub { my $self = shift; $self->getStorageLocation->delete; - return $self->SUPER::purgeRevision; -} + return super(); +}; #---------------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm index 08d38c868..177feff19 100644 --- a/lib/WebGUI/Asset/File/GalleryFile.pm +++ b/lib/WebGUI/Asset/File/GalleryFile.pm @@ -662,15 +662,15 @@ Purge the asset. Remove all comments on the GalleryFile. =cut -sub purge { +override purge => sub { my $self = shift; for my $commentId ( @{ $self->getCommentIds } ) { $self->deleteComment( $commentId ); } - return $self->SUPER::purge; -} + return super(); +}; #---------------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index 131e9a47c..3150e2276 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -493,7 +493,7 @@ purges it's data. =cut -sub purge { +override purge => sub { my $self = shift; my $db = $self->session->db; @@ -501,8 +501,8 @@ sub purge { $db->write("delete from MatrixListing_rating where listingId=?" ,[$self->getId]); $db->write("delete from MatrixListing_ratingSummary where listingId=?" ,[$self->getId]); - return $self->next::method; -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index f26af8cfa..ccc3fe22b 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -1130,16 +1130,16 @@ Extend the base method to handle cleaning up storage locations. =cut -sub purge { - my $self = shift; - my $sth = $self->session->db->read("select storageId from Post where assetId=".$self->session->db->quote($self->getId)); - while (my ($storageId) = $sth->array) { - my $storage = WebGUI::Storage->get($self->session, $storageId); - $storage->delete if defined $storage; - } - $sth->finish; - return $self->SUPER::purge; -} +override purge => sub { + my $self = shift; + my $sth = $self->session->db->read("select storageId from Post where assetId=".$self->session->db->quote($self->getId)); + while (my ($storageId) = $sth->array) { + my $storage = WebGUI::Storage->get($self->session, $storageId); + $storage->delete if defined $storage; + } + $sth->finish; + return $self->super(); +}; #------------------------------------------------------------------- @@ -1149,11 +1149,11 @@ Extend the base class to handle caching. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; eval{$self->session->cache->delete("view_".$self->getThread->getId)} if ($self->getThread); - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- @@ -1163,11 +1163,11 @@ Extend the base method to handle deleting the storage location. =cut -sub purgeRevision { +override purgeRevision => sub { my $self = shift; $self->getStorageLocation->delete; - return $self->SUPER::purgeRevision; -} + return super(); +}; diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm index 3c455cdb9..af31a3cc2 100644 --- a/lib/WebGUI/Asset/Post/Thread.pm +++ b/lib/WebGUI/Asset/Post/Thread.pm @@ -696,15 +696,15 @@ the subscriptionGroup for this thread. =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write("delete from Thread_read where threadId=?",[$self->getId]); my $group = WebGUI::Group->new($self->session, $self->subscriptionGroupId); if ($group) { $group->delete; } - $self->SUPER::purge; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index bf0cc9639..81eebdde8 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -858,14 +858,14 @@ overrides. =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write(<<'END_SQL', [$self->getId]); DELETE FROM Shortcut_overrides WHERE assetId = ? END_SQL - return $self->SUPER::purge(@_); -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Sku/EMSBadge.pm b/lib/WebGUI/Asset/Sku/EMSBadge.pm index ec5f34874..138880602 100644 --- a/lib/WebGUI/Asset/Sku/EMSBadge.pm +++ b/lib/WebGUI/Asset/Sku/EMSBadge.pm @@ -342,15 +342,15 @@ Deletes all badges and things attached to the badges. No refunds are given. =cut -sub purge { +override purge => sub { my $self = shift; my $db = $self->session->db; $db->write("delete from EMSRegistrantTicket where badgeId=?",[$self->getId]); $db->write("delete from EMSRegistrantToken where badgeId=?",[$self->getId]); $db->write("delete from EMSRegistrantRibbon where badgeId=?",[$self->getId]); $db->write("delete from EMSRegistrant where badgeId=?",[$self->getId]); - $self->SUPER::purge; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Sku/EMSRibbon.pm b/lib/WebGUI/Asset/Sku/EMSRibbon.pm index 7bb612c30..6aebc89d6 100644 --- a/lib/WebGUI/Asset/Sku/EMSRibbon.pm +++ b/lib/WebGUI/Asset/Sku/EMSRibbon.pm @@ -166,11 +166,11 @@ Deletes all entries in EMSRegistrationRibbon table for this sku. No refunds are =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write("delete from EMSRegistrantRibbon where ribbonAssetId=?",[$self->getId]); - $self->SUPER::purge; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Sku/EMSTicket.pm b/lib/WebGUI/Asset/Sku/EMSTicket.pm index d34e52fdd..f3fa4efe5 100644 --- a/lib/WebGUI/Asset/Sku/EMSTicket.pm +++ b/lib/WebGUI/Asset/Sku/EMSTicket.pm @@ -451,11 +451,11 @@ Deletes all ticket purchases of this type. No refunds are given. =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write("delete from EMSRegistrantTicket where ticketAssetId=?",[$self->getId]); - $self->SUPER::purge; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Sku/EMSToken.pm b/lib/WebGUI/Asset/Sku/EMSToken.pm index bbcd2b764..1cb38e7d7 100644 --- a/lib/WebGUI/Asset/Sku/EMSToken.pm +++ b/lib/WebGUI/Asset/Sku/EMSToken.pm @@ -159,11 +159,11 @@ Destroys all tokens of this type. No refunds are given. =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write("delete from EMSRegistrantToken where tokenAssetId=?",[$self->getId]); - $self->SUPER::purge; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Sku/Product.pm b/lib/WebGUI/Asset/Sku/Product.pm index b5bdde68f..169dc3ef1 100644 --- a/lib/WebGUI/Asset/Sku/Product.pm +++ b/lib/WebGUI/Asset/Sku/Product.pm @@ -746,7 +746,7 @@ Extend the base class to handle all file collateral. =cut -sub purge { +override purge => sub { my $self = shift; my $sth = $self->session->db->read("select image1, image2, image3, brochure, manual, warranty from Product where assetId=?", [$self->getId]); while (my @array = $sth->array) { @@ -756,8 +756,8 @@ sub purge { } } $sth->finish; - $self->SUPER::purge(); -} + super(); +}; #------------------------------------------------------------------- @@ -767,11 +767,11 @@ Extends the base class to handle cleaning up the cache for this asset. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; $self->session->cache->delete("view_".$self->getId); - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- @@ -781,7 +781,7 @@ Extend the base method to handle deleting file collateral. =cut -sub purgeRevision { +override purgeRevision => sub { my $self = shift; WebGUI::Storage->get($self->session, $self->get("image1"))->delete if ($self->get("image1")); WebGUI::Storage->get($self->session, $self->get("image2"))->delete if ($self->get("image2")); @@ -789,8 +789,8 @@ sub purgeRevision { WebGUI::Storage->get($self->session, $self->get("brochure"))->delete if ($self->get("brochure")); WebGUI::Storage->get($self->session, $self->get("manual"))->delete if ($self->get("manual")); WebGUI::Storage->get($self->session, $self->get("warranty"))->delete if ($self->get("warranty")); - return $self->SUPER::purgeRevision; -} + return super(); +}; #----------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Sku/ThingyRecord.pm b/lib/WebGUI/Asset/Sku/ThingyRecord.pm index 9ae0333ad..8789d669b 100644 --- a/lib/WebGUI/Asset/Sku/ThingyRecord.pm +++ b/lib/WebGUI/Asset/Sku/ThingyRecord.pm @@ -508,7 +508,7 @@ Remove all collateral associated with the ThingyRecord sku =cut -sub purge { +override purge => sub { my $self = shift; my $options = { constraints => [ { 'assetId = ?' => $self->getId } ] }; @@ -520,8 +520,8 @@ sub purge { # XXX: Should we also remove the records from the Thingy? - return $self->SUPER::purge; -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm index 4146510a2..59e08f794 100644 --- a/lib/WebGUI/Asset/Snippet.pm +++ b/lib/WebGUI/Asset/Snippet.pm @@ -202,15 +202,15 @@ Extending purgeCache to handle caching of the rendered snippet =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; my $cache = $self->session->cache; eval { $cache->delete("view__".$self->getId); $cache->delete("view_1_".$self->getId); }; - $self->SUPER::purgeCache(); -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm index eb398625e..7670c3b01 100644 --- a/lib/WebGUI/Asset/Story.pm +++ b/lib/WebGUI/Asset/Story.pm @@ -634,7 +634,7 @@ Cleaning up all storage objects in all revisions. =cut -sub purge { +override purge => sub { my $self = shift; ##Delete all storage locations from all revisions of the Asset my $sth = $self->session->db->read("select photo from Story where assetId=?",[$self->getId]); @@ -647,8 +647,8 @@ sub purge { } } $sth->finish; - return $self->next::method; -} + return super(); +}; #------------------------------------------------------------------- @@ -658,15 +658,15 @@ Remove the storage locations for this revision of the Asset. =cut -sub purgeRevision { +override purgeRevision => sub { my $self = shift; my $session = $self->session; foreach my $photo ( @{ $self->getPhotoData} ) { my $storage = WebGUI::Storage->get($session, $self-$photo->{storageId}); $storage->delete if $storage; } - return $self->next::method; -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index c6b820037..3a251d86a 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -1372,7 +1372,7 @@ Extend the base method to delete the subscription group and cron job for emails. =cut -sub purge { +override purge => sub { my $self = shift; my $group = WebGUI::Group->new($self->session, $self->subscriptionGroupId); if ($group) { @@ -1382,8 +1382,8 @@ sub purge { my $cron = WebGUI::Workflow::Cron->new($self->session, $self->getMailCronId); $cron->delete if defined $cron; } - $self->next::method; -} + super(); +}; #------------------------------------------------------------------- @@ -1393,15 +1393,15 @@ Extend the base method to delete view and visitor caches. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; my $cache = $self->session->cache; eval { $cache->delete("view_".$self->getId); $cache->delete($self->_visitorCacheKey); }; - $self->next::method; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm b/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm index a4354d240..971d60dea 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm @@ -111,11 +111,11 @@ Extend the base method to handle deleting information from the Newsletter_subscr =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write("delete from Newsletter_subscriptions where assetId=?", [$self->getId]); - $self->SUPER::purge(@_); -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm index 91337a2ad..57ae07364 100644 --- a/lib/WebGUI/Asset/Wobject/Dashboard.pm +++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm @@ -261,14 +261,14 @@ for this dashboard. =cut -sub purge { +override purge => sub { my $self = shift; my $userPrefField = WebGUI::ProfileField->new($self->session,$self->getContentPositionsId); if (defined $userPrefField) { $userPrefField->delete; } - $self->SUPER::purge(@_); -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index e3f98efaf..2c11b3ee2 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -1014,12 +1014,12 @@ entry collateral. =cut -sub purge { +override purge => sub { my $self = shift; $self->deleteAttachedFiles; $self->entryClass->purgeAssetEntries($self); - return $self->SUPER::purge(@_); -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index fe80a9b80..b0a4bdfb3 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -433,7 +433,7 @@ and event meta data. =cut -sub purge { +override purge => sub { my $self = shift; my $db = $self->session->db; @@ -456,8 +456,8 @@ sub purge { $db->write("delete from EMSBadgeGroup where emsAssetId=?",[$self->getId]); $db->write("delete from EMSEventMetaField where assetId=?",[$self->getId]); - $self->SUPER::purge(@_); -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm index 5fd2aa080..00b966b4e 100644 --- a/lib/WebGUI/Asset/Wobject/Folder.pm +++ b/lib/WebGUI/Asset/Wobject/Folder.pm @@ -188,11 +188,11 @@ See WebGUI::Asset::purgeCache() for details. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; eval{$self->session->cache->delete("view_".$self->getId)}; - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index 1b1d54c6f..bc4db5bf2 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -251,11 +251,11 @@ Extend the base method to delete the cookie jar =cut -sub purge { +override purge => sub { my $self = shift; $self->getCookieJar->delete; - $self->SUPER::purge; -} + super(); +}; #------------------------------------------------------------------- @@ -266,15 +266,15 @@ See WebGUI::Asset::purgeCache() for details. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; my $cache = $self->session->cache; eval { $cache->delete([$self->proxiedUrl,"URL"]); $cache->delete([$self->proxiedUrl,"HEADER"]); }; - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm index 84ef1a7ef..b62fc843f 100644 --- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm +++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm @@ -139,13 +139,13 @@ Extend the base method to cleanup the status and statusLog tables. =cut -sub purge { +override purge => sub { my $self = shift; my $session = $self->session; $session->db->write('delete from InOutBoard_status where assetId=?', [$self->getId]); $session->db->write('delete from InOutBoard_statusLog where assetId=?', [$self->getId]); - $self->SUPER::purge(@_); -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index ef16e77fc..ec49ce0a5 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -593,12 +593,12 @@ purges it's data. =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write("delete from Matrix_attribute where assetId=?",[$self->getId]); - return $self->SUPER::purge; -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm index e30c7a654..492fccb75 100644 --- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm @@ -70,11 +70,11 @@ See WebGUI::Asset::purgeCache() for details. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; eval{$self->session->cache->delete("view_".$self->getId)}; - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/MultiSearch.pm b/lib/WebGUI/Asset/Wobject/MultiSearch.pm index 86911dad8..1c63bfaec 100644 --- a/lib/WebGUI/Asset/Wobject/MultiSearch.pm +++ b/lib/WebGUI/Asset/Wobject/MultiSearch.pm @@ -80,11 +80,11 @@ See WebGUI::Asset::purgeCache() for details. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; eval{$self->session->cache->delete("view_".$self->getId)}; - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm index da68249ae..7d5f1d4de 100644 --- a/lib/WebGUI/Asset/Wobject/Poll.pm +++ b/lib/WebGUI/Asset/Wobject/Poll.pm @@ -388,11 +388,11 @@ Extend the base method to handle Poll answers. =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write("delete from Poll_answer where assetId=".$self->session->db->quote($self->getId)); - $self->SUPER::purge(); -} + super(); +}; #---------------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm index fa4730997..fdb67c27d 100644 --- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm +++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm @@ -624,19 +624,6 @@ sub processErrors { } -#------------------------------------------------------------------- - -=head2 purge - -=cut - -sub purge { - my $self = shift; - #purge your wobject-specific data here. This does not include fields - # you create for your NewWobject asset/wobject table. - return $self->SUPER::purge; -} - #------------------------------------------------------------------- =head2 setSessionVars diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index 8f4b6f0d9..3021af464 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -550,11 +550,11 @@ See WebGUI::Asset::purgeCache() for details. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; eval{$self->session->cache->delete("view_".$self->getId)}; - $self->SUPER::purgeCache; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm index 54896b0de..6a4a17031 100644 --- a/lib/WebGUI/Asset/Wobject/StockData.pm +++ b/lib/WebGUI/Asset/Wobject/StockData.pm @@ -311,20 +311,6 @@ sub prepareView { } -#------------------------------------------------------------------- - -=head2 purge ( ) - -removes collateral data associated with a StockData when the system -purges it's data. - -=cut - -sub purge { - my $self = shift; - return $self->SUPER::purge; -} - #------------------------------------------------------------------- =head2 view ( ) diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 64ee6e98c..e3deca4e4 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -1337,26 +1337,13 @@ Completely remove from WebGUI. =cut -sub purge { +override purge => sub { my $self = shift; $self->session->db->write( 'delete from Survey_response where assetId = ?', [ $self->getId() ] ); $self->session->db->write( 'delete from Survey_tempReport where assetId = ?', [ $self->getId() ] ); $self->session->db->write( 'delete from Survey where assetId = ?', [ $self->getId() ] ); - return $self->SUPER::purge; -} - -#------------------------------------------------------------------- - -=head2 purgeCache ( ) - -See WebGUI::Asset::purgeCache() for details. - -=cut - -sub purgeCache { - my $self = shift; - return $self->SUPER::purgeCache; -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm index c3b8fbaf5..a0a6e338c 100644 --- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm @@ -282,11 +282,11 @@ See WebGUI::Asset::purgeCache() for details. =cut -sub purgeCache { +override purgeCache => sub { my $self = shift; eval{$self->session->cache->delete("view_".$self->getId)}; - $self->next::method; -} + super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm index 777581ba7..cdb0937f6 100644 --- a/lib/WebGUI/Asset/Wobject/Thingy.pm +++ b/lib/WebGUI/Asset/Wobject/Thingy.pm @@ -1321,7 +1321,7 @@ purges it's data. =cut -sub purge { +override purge => sub { my $self = shift; my $session = $self->session; my $db = $self->session->db; @@ -1332,8 +1332,8 @@ sub purge { $db->write("delete from Thingy_things where assetId = ?",[$self->getId]); $db->write("delete from Thingy_fields where assetId = ?",[$self->getId]); - return $self->SUPER::purge; -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/TimeTracking.pm b/lib/WebGUI/Asset/Wobject/TimeTracking.pm index e53528e98..4a39e8a5c 100644 --- a/lib/WebGUI/Asset/Wobject/TimeTracking.pm +++ b/lib/WebGUI/Asset/Wobject/TimeTracking.pm @@ -110,19 +110,6 @@ sub processErrors { } -#------------------------------------------------------------------- - -=head2 purge - -=cut - -sub purge { - my $self = shift; - #purge your wobject-specific data here. This does not include fields - # you create for your NewWobject asset/wobject table. - return $self->SUPER::purge; -} - #------------------------------------------------------------------- =head2 getDaysInWeek diff --git a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton index 8baab7274..46ce772f3 100644 --- a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton +++ b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton @@ -136,13 +136,13 @@ wobject instances, you will need to purge them here. =cut -sub purge { +override purge => sub { my $self = shift; #purge your wobject-specific data here. This does not include fields # you create for your NewWobject asset/wobject table. - return $self->SUPER::purge; -} + return super(); +}; #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/_NewAsset.skeleton b/lib/WebGUI/Asset/_NewAsset.skeleton index 126e6a032..bb27448c2 100644 --- a/lib/WebGUI/Asset/_NewAsset.skeleton +++ b/lib/WebGUI/Asset/_NewAsset.skeleton @@ -193,10 +193,10 @@ asset instances, you will need to purge them here. =cut -sub purge { +override purge => sub { my $self = shift; - return $self->SUPER::purge; -} + return super(); +}; #------------------------------------------------------------------- @@ -206,10 +206,10 @@ This method is called when data is purged by the system. =cut -sub purgeRevision { +override purgeRevision => sub { my $self = shift; - return $self->SUPER::purgeRevision; -} + return super(); +}; #-------------------------------------------------------------------