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

Moose seems to clean this class of anything that it uses. Changed bare calls to croak to Carp::croak.

Browse source
This commit is contained in:
Colin Kuskie 2009-12-18 13:09:03 -08:00
parent c50e2f9bcb
commit ec5f610701
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lib/WebGUI/Asset.pm
View file

@ -14,31 +14,12 @@ package WebGUI::Asset;
=cut =cut
use Carp qw( croak confess ); use Carp;
use Scalar::Util qw( blessed ); use Scalar::Util qw( blessed );
use Clone qw(clone); use Clone qw(clone);
use JSON; use JSON;
use HTML::Packer; use HTML::Packer;
use WebGUI::AssetBranch;
use WebGUI::AssetClipboard;
use WebGUI::AssetExportHtml;
use WebGUI::AssetLineage;
use WebGUI::AssetMetaData;
use WebGUI::AssetPackage;
use WebGUI::AssetTrash;
use WebGUI::AssetVersioning;
use strict;
use Tie::IxHash;
use WebGUI::AdminConsole;
use WebGUI::Form;
use WebGUI::HTML;
use WebGUI::HTMLForm;
use WebGUI::Keyword;
use WebGUI::ProgressBar;
use WebGUI::Search::Index;
use WebGUI::TabForm;
use WebGUI::Utility;
use WebGUI::Definition::Asset; use WebGUI::Definition::Asset;
attribute assetName => 'asset', attribute assetName => 'asset',
attribute tableName => 'assetData', attribute tableName => 'assetData',
@ -239,6 +220,26 @@ property assetSize => (
defaultValue => 0, defaultValue => 0,
); );
use WebGUI::AssetBranch;
use WebGUI::AssetClipboard;
use WebGUI::AssetExportHtml;
use WebGUI::AssetLineage;
use WebGUI::AssetMetaData;
use WebGUI::AssetPackage;
use WebGUI::AssetTrash;
use WebGUI::AssetVersioning;
use strict;
use Tie::IxHash;
use WebGUI::AdminConsole;
use WebGUI::Form;
use WebGUI::HTML;
use WebGUI::HTMLForm;
use WebGUI::Keyword;
use WebGUI::ProgressBar;
use WebGUI::Search::Index;
use WebGUI::TabForm;
use WebGUI::Utility;
=head1 NAME =head1 NAME
Package WebGUI::Asset Package WebGUI::Asset
@ -1757,16 +1758,16 @@ sub newPending {
my $class = shift; my $class = shift;
my $session = shift; my $session = shift;
my $assetId = shift; my $assetId = shift;
croak "First parameter to newPending needs to be a WebGUI::Session object" Carp::croak "First parameter to newPending needs to be a WebGUI::Session object"
unless $session && $session->isa('WebGUI::Session'); unless $session && $session->isa('WebGUI::Session');
croak "Second parameter to newPending needs to be an assetId" Carp::croak "Second parameter to newPending needs to be an assetId"
unless $assetId; unless $assetId;
my ($className, $revisionDate) = $session->db->quickArray("SELECT asset.className, assetData.revisionDate FROM asset INNER JOIN assetData ON asset.assetId = assetData.assetId WHERE asset.assetId = ? ORDER BY assetData.revisionDate DESC LIMIT 1", [ $assetId ]); my ($className, $revisionDate) = $session->db->quickArray("SELECT asset.className, assetData.revisionDate FROM asset INNER JOIN assetData ON asset.assetId = assetData.assetId WHERE asset.assetId = ? ORDER BY assetData.revisionDate DESC LIMIT 1", [ $assetId ]);
if ($className ne "" || $revisionDate ne "") { if ($className ne "" || $revisionDate ne "") {
return WebGUI::Asset->new($session, $assetId, $className, $revisionDate); return WebGUI::Asset->new($session, $assetId, $className, $revisionDate);
} }
else { else {
croak "Invalid asset id '$assetId' requested!"; Carp::croak "Invalid asset id '$assetId' requested!";
} }
} }