oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: purge old asset revisions could purge the most recent revision if the

Browse source 
database had some referential integrity probems
This commit is contained in:
JT Smith 2007-07-30 18:41:39 +00:00
parent 265400a010
commit 1e9e4d810f
4 changed files with 82 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/changelog/7.x.x.txt
View file

@ -1,8 +1,10 @@
7.4.1
- Fixed a bug where crons wouldn't load into spectre's queue at startup.
- Fixed a bug in the Collaboration System where posts from the Safari browser
would be submitted without changes.
- fix: crons wouldn't load into spectre's queue at startup.
- fix: in the Collaboration System, posts from the Safari browser
are submitted without changes.
- fix: New pagination breaks SQL Reports with semicolons
- fix: purge old asset revisions could purge the most recent revision if the
database had some referential integrity probems
- Wiki autolinks prefer longest title match
7.4.0

10
lib/WebGUI/Asset.pm
View file

@ -1652,15 +1652,7 @@ sub new {
return undef;
}
my $assetRevision = $session->stow->get("assetRevision");
my $revisionDate = shift || $assetRevision->{$assetId}{$session->scratch->get("versionTag")||'_'};
unless ($revisionDate) {
($revisionDate) = $session->db->quickArray("select max(revisionDate) from assetData where assetId=? and
(status='approved' or status='archived' or tagId=?) order by assetData.revisionDate",
[$assetId, $session->scratch->get("versionTag")]);
$assetRevision->{$assetId}{$session->scratch->get("versionTag")||'_'} = $revisionDate;
$session->stow->set("assetRevision",$assetRevision);
}
my $revisionDate = shift || $class->getCurrentRevisionDate($session, $assetId);
return undef unless ($revisionDate);
unless ($class ne 'WebGUI::Asset' or defined $className) {

34
lib/WebGUI/AssetVersioning.pm
View file

@ -178,6 +178,40 @@ sub getAutoCommitWorkflowId {
#-------------------------------------------------------------------
=head2 getCurrentRevisionDate ( session, assetId )
This is a class method. Returns the revision date for the revision of the specified asset that is the currently
published revision for the version tag that we're currently operating under. If no version tag, then the revision
that will be displayed publicly is the one returned.
=head3 session
A session object.
=head3 assetId
The unique identifier for an asset.
=cut
sub getCurrentRevisionDate {
my $class = shift;
my $session = shift;
my $assetId = shift;
my $assetRevision = $session->stow->get("assetRevision");
my $revisionDate = $assetRevision->{$assetId}{$session->scratch->get("versionTag")||'_'};
unless ($revisionDate) {
($revisionDate) = $session->db->quickArray("select max(revisionDate) from assetData where assetId=? and
(status='approved' or status='archived' or tagId=?) order by assetData.revisionDate",
[$assetId, $session->scratch->get("versionTag")]);
$assetRevision->{$assetId}{$session->scratch->get("versionTag")||'_'} = $revisionDate;
$session->stow->set("assetRevision",$assetRevision);
}
return $revisionDate;
}
#-------------------------------------------------------------------
=head2 getRevisionCount ( [ status ] )
Returns the number of revisions available for this asset.

54
lib/WebGUI/Workflow/Activity/PurgeOldAssetRevisions.pm
View file

@ -75,19 +75,49 @@ See WebGUI::Workflow::Activity::execute() for details.
=cut
sub execute {
my $self = shift;
my $sth = $self->session->db->read("select assetData.assetId,asset.className,assetData.revisionDate from asset left join assetData on asset.assetId=assetData.assetId where assetData.revisionDate<? order by assetData.revisionDate asc", [time() - $self->get("purgeAfter")]);
while (my ($id, $class, $version) = $sth->array) {
my $asset = WebGUI::Asset->new($self->session, $id,$class,$version);
if (defined $asset) {
if ($asset->getRevisionCount("approved") > 1) {
$asset->purgeRevision;
}
} else {
$self->session->errorHandler->error("Could not instanciate asset $id $class $version perhaps it is corrupt.")
}
my ($self, $nothing, $instance) = @_;
my $session = $self->session;
my $log = $session->errorHandler;
# keep track of how much time it's taking
my $start = time();
# figure out if we left off somewhere
my $lastRunVersion = $instance->getScratch("purgeOldAssetsLastRevisionDate");
my $suspectDate = time() - $self->get("purgeAfter");
$suspectDate = ($suspectDate > $lastRunVersion) ? $suspectDate : $lastRunVersion;
# the query to find old revisions
my $sth = $session->db->read("select assetData.assetId,asset.className,assetData.revisionDate from asset
left join assetData on asset.assetId=assetData.assetId where assetData.revisionDate<?
order by assetData.revisionDate asc", [$suspectDate]);
while (my ($id, $class, $version) = $sth->array) {
# we never want to purge the current version
if (WebGUI::Asset->getCurrentRevisionDate($session, $id) == $version) {
next;
}
$sth->finish;
# instanciate and purge
my $asset = WebGUI::Asset->new($session, $id,$class,$version);
if (defined $asset) {
if ($asset->getRevisionCount("approved") > 1) {
$log->info("Purging revision $version for asset $id.");
$asset->purgeRevision;
}
}
else {
$log->error("Could not instanciate asset $id $class $version perhaps it is corrupt.")
}
# give up if we're taking too long
if (time() - $start > 55) {
$log->info("Ran out of time, will pick up with revision $version when we start again.");
$instance->setScratch("purgeOldAssetsLastRevisionDate", $version);
$sth->finish;
return $self->WAITING;
}
}
return $self->COMPLETE;
}