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

12
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -545,7 +545,7 @@ sub getEvent {
my $self = shift;
my $assetId = shift;
# Warn and return undef if no assetId
$self->session->errorHandler->warn("WebGUI::Asset::Wobject::Calendar->getEvent :: No asset ID."), return
$self->session->log->warn("WebGUI::Asset::Wobject::Calendar->getEvent :: No asset ID."), return
unless $assetId;
# ? Perhaps use Stow to cache events ?
@ -553,11 +553,11 @@ sub getEvent {
my $event = WebGUI::Asset->newById($self->session, $assetId);
unless ( $event ) {
$self->session->errorHandler->warn("Event '$assetId' doesn't exist!");
$self->session->log->warn("Event '$assetId' doesn't exist!");
return undef;
}
$self->session->errorHandler->warn("WebGUI::Asset::Wobject::Calendar->getEvent :: Event '$assetId' not a child of calendar '".$self->getId."'"), return
$self->session->log->warn("WebGUI::Asset::Wobject::Calendar->getEvent :: Event '$assetId' not a child of calendar '".$self->getId."'"), return
unless $event->parentId eq $self->getId;
return $event;
@ -609,7 +609,7 @@ sub getEventsIn {
# Warn and return undef if no startDate or endDate
unless ($start && $end) {
$self->session->errorHandler->warn("WebGUI::Asset::Wobject::Calendar->getEventsIn() called with not enough arguments at ".join('::',(caller)[1,2]));
$self->session->log->warn("WebGUI::Asset::Wobject::Calendar->getEventsIn() called with not enough arguments at ".join('::',(caller)[1,2]));
return undef;
}
@ -823,7 +823,7 @@ sub prepareView {
$self->session->style->makePrintable(1);
}
#$self->session->errorHandler->warn("Prepare view ".$view." with template ".$self->get("templateId".$view));
#$self->session->log->warn("Prepare view ".$view." with template ".$self->get("templateId".$view));
my $template = WebGUI::Asset::Template->newById($self->session, $self->get("templateId".$view));
if (!$template) {
@ -951,7 +951,7 @@ sub view {
: lc $params->{type} eq "week" ? $self->viewWeek( $params )
: lc $params->{type} eq "day" ? $self->viewDay( $params )
: lc $params->{type} eq "list" ? $self->viewList( $params )
: return $self->errorHandler->error("Calendar invalid 'type=' url parameter")
: return $self->log->error("Calendar invalid 'type=' url parameter")
;
##### Process the template

2
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -1596,7 +1596,7 @@ sub view {
my $cache = $self->session->cache;
if ($self->_visitorCacheOk) {
my $out = $cache->get($self->_visitorCacheKey);
$self->session->errorHandler->debug("HIT") if $out;
$self->session->log->debug("HIT") if $out;
return $out if $out;
}

2
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -1151,7 +1151,7 @@ sub sendEmail {
$groupId = $group->getId;
}
else {
$self->session->errorHandler->warn($self->getId . ": Unable to send message, no user or group found.");
$self->session->log->warn($self->getId . ": Unable to send message, no user or group found.");
return;
}
WebGUI::Inbox->new($self->session)->addMessage({

4
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -837,7 +837,7 @@ sub www_addSubmission {
}
$form = eval { WebGUI::Asset->newById($session, $formId); };
if (Exception::Class->caught()) {
$session->errorHandler->error(__PACKAGE__ . " - failed to instanciate asset with assetId $formId");
$session->log->error(__PACKAGE__ . " - failed to instanciate asset with assetId $formId");
}
return $form->www_addSubmission;
}
@ -1863,7 +1863,7 @@ className='WebGUI::Asset::Sku::EMSTicket' and state='published' and revisionDate
# skip borked tickets
unless (defined $ticket) {
$session->errorHandler->warn("EMSTicket $id couldn't be instanciated by EMS ".$self->getId.".");
$session->log->warn("EMSTicket $id couldn't be instanciated by EMS ".$self->getId.".");
$totalTickets--;
next;
}

8
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
View file

@ -165,7 +165,7 @@ sub addArchive {
my $class = $gallery->getAssetClassForFile( $filePath );
next unless $class; # class is undef for those files the Gallery can't handle
$session->errorHandler->info( "Adding $filename to album!" );
$session->log->info( "Adding $filename to album!" );
$outputSub->('Adding %s to album', $filename);
# Remove the file extension
$filename =~ s{\.[^.]+}{};
@ -1417,7 +1417,7 @@ sub www_edit {
$asset->promote;
}
else {
$session->errorHandler->error("Couldn't promote asset '$assetId' because we couldn't instantiate it.");
$session->log->error("Couldn't promote asset '$assetId' because we couldn't instantiate it.");
}
}
# Demote the file
@ -1429,7 +1429,7 @@ sub www_edit {
$asset->demote;
}
else {
$session->errorHandler->error("Couldn't demote asset '$assetId' because we couldn't instantiate it.");
$session->log->error("Couldn't demote asset '$assetId' because we couldn't instantiate it.");
}
}
# Rotate to the left
@ -1477,7 +1477,7 @@ sub www_edit {
$asset->purge;
}
else {
$session->errorHandler->error( "Couldn't delete asset '$assetId' because we couldn't instanciate it.");
$session->log->error( "Couldn't delete asset '$assetId' because we couldn't instanciate it.");
}
}

4
lib/WebGUI/Asset/Wobject/HttpProxy.pm
View file

@ -372,8 +372,8 @@ sub view {
}
### DEBUG
#require Data::Dumper;
#$self->session->errorHandler->warn("DEBUG: ".Data::Dumper::Dumper($params));
#$self->session->errorHandler->warn("URL: $proxiedUrl");
#$self->session->log->warn("DEBUG: ".Data::Dumper::Dumper($params));
#$self->session->log->warn("URL: $proxiedUrl");
$request = HTTP::Request->new(GET => $proxiedUrl, $header) || return "wrong url"; # Create GET request
} else { # It's a POST

2
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -1290,7 +1290,7 @@ sub www_getCompareListData {
{ value=>$result->{$listingId_safe} },defaultValue=>0)->getValueAsHtml;
}
if($session->scratch->get('stickied_'.$result->{attributeId})){
# $self->session->errorHandler->warn("found checked stickie: ".$result->{attributeId});
# $self->session->log->warn("found checked stickie: ".$result->{attributeId});
$result->{checked} = 'checked';
}
else{

2
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -431,7 +431,7 @@ sub view {
my $absoluteDepthOfFirstPage; # Will set on first iteration of loop, below
my %lastChildren;
my $previousPageData = undef;
my $eh = $self->session->errorHandler;
my $eh = $self->session->log;
while ( 1 ) {
my $asset;
eval { $asset = $assetIter->() };

2
lib/WebGUI/Asset/Wobject/Poll.pm
View file

@ -537,7 +537,7 @@ sub view {
$var{graphUrl} = $storage->getUrl($filename);
$var{hasImageGraph} = 1;
} else {
$self->session->errorHandler->error('The graph configuration hash of the Poll ('.$self->getUrl.') is corrupt.');
$self->session->log->error('The graph configuration hash of the Poll ('.$self->getUrl.') is corrupt.');
}
}

18
lib/WebGUI/Asset/Wobject/ProjectManager.pm
View file

@ -90,7 +90,7 @@ property groupToAdd => (
sub _addDaysForMonth {
my $self = shift;
my $dt = $self->session->datetime;
my $eh = $self->session->errorHandler;
my $eh = $self->session->log;
my $days_loop = $_[0];
my $hash = $_[1];
@ -273,7 +273,7 @@ sub _htmlOfResourceList {
$subvar->{resourceName} = WebGUI::HTML::format($displayName, 'text');
$subvar->{resourceIcon} = 'users.gif';
} else {
$self->session->errorHandler->fatal("Unknown kind of resource '$resourceKind'!");
$self->session->log->fatal("Unknown kind of resource '$resourceKind'!");
}
push @{$var->{resourceLoop}}, $subvar;
@ -423,7 +423,7 @@ sub _updateDependantDates {
my $pred = $taskHash->{$predecessor};
unless ($pred) {
# Predecessor has to have a lower sequence number, right? Right?
$self->session->errorHandler->error("Internal: predecessor '$predecessor' of task with seqNum '$seqNum' not in task hash?!");
$self->session->log->error("Internal: predecessor '$predecessor' of task with seqNum '$seqNum' not in task hash?!");
next;
}
@ -655,7 +655,7 @@ sub setSessionVars {
sub updateProjectTask {
my $self = shift;
my $db = $self->session->db;
my $eh = $self->session->errorHandler;
my $eh = $self->session->log;
my $taskId = $_[0];
my $projectId = $_[1];
@ -726,7 +726,7 @@ sub view {
my ($session,$privilege,$form,$db,$datetime,$i18n,$user) = $self->setSessionVars;
my $config = $session->config;
my $eh = $session->errorHandler;
my $eh = $session->log;
$var->{'extras'} = $session->url->make_urlmap_work($config->get("extrasURL"))."/wobject/ProjectManager";
$var->{'project.create'} = $self->getUrl("func=editProject;projectId=new");
@ -871,7 +871,7 @@ sub www_drawGanttChart {
my ($session,$privilege,$form,$db,$dt,$i18n,$user) = $self->setSessionVars;
my $config = $session->config;
my $style = $session->style;
my $eh = $session->errorHandler;
my $eh = $session->log;
#Set up some the task data
my $projectId = $_[0];
@ -1236,7 +1236,7 @@ sub www_editProjectSave {
my $self = shift;
#Set Method Helpers
my ($session,$privilege,$form,$db,$dt,$i18n,$user) = $self->setSessionVars;
my $eh = $session->errorHandler;
my $eh = $session->log;
#Check Privileges
return $privilege->insufficient unless $self->_userCanManageProjectList($user);
@ -1509,7 +1509,7 @@ sub www_editTaskSave {
#Set Method Helpers
my ($session,$privilege,$form,$db,$dt,$i18n,$user) = $self->setSessionVars;
my $config = $session->config;
my $eh = $session->errorHandler;
my $eh = $session->log;
my $projectId = $form->get("projectId");
my $project = $db->quickHashRef("select * from PM_project where projectId=".$db->quote($projectId));
@ -1706,7 +1706,7 @@ sub www_viewProject {
my $user = $session->user;
my $config = $session->config;
my $style = $session->style;
my $eh = $session->errorHandler;
my $eh = $session->log;
my $projectId = shift || $form->get("projectId");
#Check Privileges

10
lib/WebGUI/Asset/Wobject/SQLReport.pm
View file

@ -555,7 +555,7 @@ sub _processQuery {
}
if (! $self->{_query}{$nr}{dbQuery} || $self->{_query}{$nr}{dbQuery} =~ m{\A \s* \Z}msx) {
$self->session->errorHandler->warn("No query specified for query $nr on '" . $self->getId . "'");
$self->session->log->warn("No query specified for query $nr on '" . $self->getId . "'");
push @{$self->{_debug_loop}}, { 'debug.output' => sprintf($i18n->get('No query specified for query'), $nr) };
return \%var;
}
@ -575,7 +575,7 @@ sub _processQuery {
push(@{$self->{_debug_loop}},{'debug.output'=>$i18n->get('debug placeholder parameters').join(",",@$placeholderParams)});
my $dbLink = WebGUI::DatabaseLink->new($self->session,$self->{_query}{$nr}{databaseLinkId});
if (!$dbLink) {
$self->session->errorHandler->error("Could not find database link for query #$nr: '".$self->{_query}{$nr}{databaseLinkId}."'. Has it been created?");
$self->session->log->error("Could not find database link for query #$nr: '".$self->{_query}{$nr}{databaseLinkId}."'. Has it been created?");
push @{$self->{_debug_loop}}, { 'debug.output' => 'Could not find database link'};
return \%var;
}
@ -618,7 +618,7 @@ sub _processQuery {
my $p = WebGUI::Paginator->new($self->session,$url,$paginateAfter, undef, $paginatePage);
my $error = $p->setDataByQuery($query,$dbh,1,$placeholderParams);
if ($error ne "") {
$self->session->errorHandler->warn("There was a problem with the query: ".$error);
$self->session->log->warn("There was a problem with the query: ".$error);
push(@{$self->{_debug_loop}},{'debug.output'=>$i18n->get(11)." ".$error});
}
else {
@ -670,12 +670,12 @@ sub _processQuery {
}
} else {
push(@{$self->{_debug_loop}},{'debug.output'=>$i18n->get(10)});
$self->session->errorHandler->warn("SQLReport [".$self->getId."] The SQL query is improperly formatted.");
$self->session->log->warn("SQLReport [".$self->getId."] The SQL query is improperly formatted.");
}
$dbLink->disconnect;
} else {
push(@{$self->{_debug_loop}},{'debug.output'=>$i18n->get(12)});
$self->session->errorHandler->warn("SQLReport [".$self->getId."] Could not connect to database.");
$self->session->log->warn("SQLReport [".$self->getId."] Could not connect to database.");
}
return \%var;
}

2
lib/WebGUI/Asset/Wobject/Shelf.pm
View file

@ -299,7 +299,7 @@ sub view {
PRODUCT: foreach my $id (@productIds) {
my $asset = WebGUI::Asset->newById($session, $id);
if (!defined $asset) {
$session->errorHandler->error(q|Couldn't instanciate SKU with assetId |.$id.q| on shelf with assetId |.$self->getId);
$session->log->error(q|Couldn't instanciate SKU with assetId |.$id.q| on shelf with assetId |.$self->getId);
next PRODUCT;
}
push @products, $asset if $asset->canView;

20
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -71,7 +71,7 @@ sub addField {
my $dbDataType = shift || $self->_getDbDataType($field->{fieldType});
my $session = $self->session;
my $db = $session->db;
my $error = $session->errorHandler;
my $error = $session->log;
my ($oldFieldId, $newFieldId,$useAssetId,$useSequence);
$error->info("Adding Field, label: ".$field->{label}.", fieldId: ".$field->{fieldId}.",thingId: ".$field->{thingId});
@ -125,7 +125,7 @@ sub addThing {
my $thing = shift;
my $isImport = shift;
my $db = $self->session->db;
my $error = $self->session->errorHandler;
my $error = $self->session->log;
my ($oldThingId, $newThingId,$useAssetId);
$error->info("Adding Thing, label: ".$thing->{label}.", id: ".$thing->{thingId});
@ -376,7 +376,7 @@ sub deleteField {
my $thingId = shift;
my $keepSequenceNumbers = shift;
my $db = $self->session->db;
my $error = $self->session->errorHandler;
my $error = $self->session->log;
my $deletedSequenceNumber;
if ($keepSequenceNumbers ne "1"){
@ -521,7 +521,7 @@ sub deleteThing {
my $self = shift;
my $thingId = shift;
my $session = $self->session;
my $error = $session->errorHandler;
my $error = $session->log;
$self->deleteCollateral("Thingy_things","thingId",$thingId);
$self->deleteCollateral("Thingy_fields","thingId",$thingId);
@ -1260,7 +1260,7 @@ sub importAssetCollateralData {
my $self = shift;
my $session = $self->session;
my $error = $session->errorHandler;
my $error = $session->log;
my $data = shift;
my $id = $data->{properties}{assetId};
my $class = $data->{properties}{className};
@ -1433,7 +1433,7 @@ sub _updateFieldType {
my $self = shift;
my $session = $self->session;
my $error = $session->errorHandler;
my $error = $session->log;
my $newFieldType = shift;
my $fieldId = shift;
@ -1721,7 +1721,7 @@ sub www_editThing {
foreach my $fieldType ( keys %{ WebGUI::Form::FieldType->new($session)->getTypes }) {
my $form = eval { WebGUI::Pluggable::instanciate("WebGUI::Form::".$fieldType, "new", [$session]) };
if ($@) {
$session->errorHandler->error($@);
$session->log->error($@);
next;
}
my $definition = $form->definition($session);
@ -2789,7 +2789,7 @@ sub www_import {
push(@insertColumns, $field) if ($session->form->process("fileContains_".$field->{fieldId}));
}
my $error = $self->session->errorHandler;
my $error = $self->session->log;
my $storage = WebGUI::Storage->createTemp($self->session);
$handleDuplicates = $session->form->process("handleDuplicates");
@ -3038,7 +3038,7 @@ sub www_moveFieldConfirm {
my $session = $self->session;
return $session->privilege->insufficient() unless $self->canEdit;
my $error = $self->session->errorHandler;
my $error = $self->session->log;
my $direction = $session->form->process('direction');
my $assetId = $self->getId;
my $fieldId = $session->form->process('fieldId');
@ -3290,7 +3290,7 @@ sequenceNumber');
}
}
else{
$self->session->errorHandler->warn("The default Thing has no fields selected to display in the search.");
$self->session->log->warn("The default Thing has no fields selected to display in the search.");
$noFields = 1;
}

18
lib/WebGUI/Asset/Wobject/TimeTracking.pm
View file

@ -120,7 +120,7 @@ sub getDaysInWeek {
my $week = $_[0];
return [] unless $week;
my ($session,$dt,$eh) = $self->getSessionVars("datetime","errorHandler");
my ($session,$dt,$eh) = $self->getSessionVars("datetime","log");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
#Week View Below
@ -169,7 +169,7 @@ sub view {
my $self = shift;
my $var = $self->get;
my ($session,$privilege,$form,$db,$dt,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","datetime","user","errorHandler","config");
my ($session,$privilege,$form,$db,$dt,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","datetime","user","log","config");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
$var->{'extras'} = $session->url->make_urlmap_work($config->get("extrasURL"))."/wobject/TimeTracking";
@ -210,7 +210,7 @@ sub view {
sub www_editTimeEntrySave {
my $self = shift;
my ($session,$privilege,$form,$db,$user,$eh,$dt) = $self->getSessionVars("privilege","form","db","user","errorHandler","datetime");
my ($session,$privilege,$form,$db,$user,$eh,$dt) = $self->getSessionVars("privilege","form","db","user","log","datetime");
return $privilege->insufficient unless ($self->canView);
@ -289,7 +289,7 @@ sub www_editTimeEntrySave {
sub www_deleteProject {
my $self = shift;
my ($session,$privilege,$form,$db,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","user","errorHandler","config");
my ($session,$privilege,$form,$db,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","user","log","config");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
#Check Privileges
@ -316,7 +316,7 @@ sub www_deleteProject {
sub www_editProject {
my $self = shift;
my ($session,$privilege,$form,$db,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","user","errorHandler","config");
my ($session,$privilege,$form,$db,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","user","log","config");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
#Check Privileges
@ -421,7 +421,7 @@ sub www_editProject {
sub www_editProjectSave {
my $self = shift;
my ($session,$privilege,$form,$db,$dt,$user,$eh) = $self->getSessionVars("privilege","form","db","datetime","user","errorHandler");
my ($session,$privilege,$form,$db,$dt,$user,$eh) = $self->getSessionVars("privilege","form","db","datetime","user","log");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
#Check Privileges
@ -486,7 +486,7 @@ sub www_editProjectSave {
sub www_manageProjects {
my $self = shift;
my ($session,$privilege,$form,$db,$dt,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","datetime","user","errorHandler","config");
my ($session,$privilege,$form,$db,$dt,$user,$eh,$config) = $self->getSessionVars("privilege","form","db","datetime","user","log","config");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
#Check Privileges
@ -615,7 +615,7 @@ sub www_buildTimeTable {
my $viewVar = $_[0];
my $var = {};
$var->{'extras'} = $viewVar->{'extras'};
my ($session,$dt,$eh,$form,$db,$user,$privilege) = $self->getSessionVars("datetime","errorHandler","form","db","user","privilege");
my ($session,$dt,$eh,$form,$db,$user,$privilege) = $self->getSessionVars("datetime","log","form","db","user","privilege");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
return $privilege->insufficient unless ($self->canView);
@ -785,7 +785,7 @@ sub www_buildTimeTable {
sub _buildRow {
my $self = shift;
my ($session,$dt,$eh,$form,$db,$user) = $self->getSessionVars("datetime","errorHandler","form","db","user");
my ($session,$dt,$eh,$form,$db,$user) = $self->getSessionVars("datetime","log","form","db","user");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
my $entry = $_[0] || {};

2
lib/WebGUI/Asset/Wobject/UserList.pm
View file

@ -243,7 +243,7 @@ sub getFormElement {
my $values = WebGUI::Operation::Shared::secureEval($self->session,$data->{possibleValues});
unless (ref $values eq 'HASH') {
if ($self->possibleValues =~ /\S/) {
$self->session->errorHandler->warn("Could not get a hash out of possible values for profile field "
$self->session->log->warn("Could not get a hash out of possible values for profile field "
.$self->getId);
}
$values = {};

2
lib/WebGUI/Asset/Wobject/WikiMaster.pm
View file

@ -294,7 +294,7 @@ sub appendRecentChanges {
while (my ($id, $version) = $revisions->array) {
my $asset = WebGUI::Asset->newById($self->session, $id, $version);
unless (defined $asset) {
$self->session->errorHandler->error("Asset $id $version could not be instanciated.");
$self->session->log->error("Asset $id $version could not be instanciated.");
next;
}
my $user = WebGUI::User->new($self->session, $asset->actionTakenBy);