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

change ErrorHandler to Log

Browse source
This commit is contained in:
Doug Bell 2010-10-27 12:50:12 -05:00
parent d11cd6f4f7
commit 199c4e4960
90 changed files with 311 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Asset/File/GalleryFile/Photo.pm
View file

@ -255,7 +255,7 @@ sub getExifData {
# isn't perfect, so handle errors gracefully
my $exif = eval { from_json( $self->exifData ) };
if ( $@ ) {
$self->session->errorHandler->warn(
$self->session->log->warn(
"Could not parse JSON data for EXIF in Photo '" . $self->title
. "' (" . $self->getId . "): " . $@
);
@ -400,7 +400,7 @@ sub makeResolutions {
$resolutions ||= $self->getGallery->getImageResolutions;
my $storage = $self->getStorageLocation;
$self->session->errorHandler->info(" Making resolutions for '" . $self->filename . q{'});
$self->session->log->info(" Making resolutions for '" . $self->filename . q{'});
for my $res ( @$resolutions ) {
# carp if resolution is bad

10
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -98,7 +98,7 @@ sub unzip {
if ($filename =~ m/\.zip$/i) {
my $zip = Archive::Zip->new();
unless ($zip->read($filename) == $zip->AZ_OK){
$self->session->errorHandler->warn($i18n->get("zip_error"));
$self->session->log->warn($i18n->get("zip_error"));
return 0;
}
$zip->extractTree();
@ -106,12 +106,12 @@ sub unzip {
} elsif ($filename =~ m/\.tar$/i) {
Archive::Tar->extract_archive($filepath.'/'.$filename,1);
if (Archive::Tar->error) {
$self->session->errorHandler->warn(Archive::Tar->error);
$self->session->log->warn(Archive::Tar->error);
return 0;
}
$self->fixFilenames;
} else {
$self->session->errorHandler->warn($i18n->get("bad_archive"));
$self->session->log->warn($i18n->get("bad_archive"));
}
return 1;
@ -191,7 +191,7 @@ override processEditForm => sub {
}
unless ($self->unzip($storage,$self->filename)) {
$self->session->errorHandler->warn($i18n->get("unzip_error"));
$self->session->log->warn($i18n->get("unzip_error"));
}
};
@ -214,7 +214,7 @@ sub view {
return $out if $out;
}
my %var = %{$self->get};
#$self->session->errorHandler->warn($self->getId);
#$self->session->log->warn($self->getId);
$var{controls} = $self->getToolbar;
if($self->session->scratch->get("za_error")) {
$var{error} = $self->session->scratch->get("za_error");