r9012@llin: dpavlin | 2005-11-21 22:25:45 +0100

 move $log->logconfess to $self->confess so that Catalyst works

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@87 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/lib/WebPAC/Search/Estraier.pm b/lib/WebPAC/Search/Estraier.pm
index df62eb9..3097418 100644 (file)
--- a/lib/WebPAC/Search/Estraier.pm
+++ b/lib/WebPAC/Search/Estraier.pm
@@ -115,10 +115,10 @@ sub search {
 
        my $log = $self->_get_logger;
 
-       $log->logconfess('need db in object') unless ($self->{'db'});
-       $log->logconfess('need attr') unless ($args->{'attr'});
+       $self->confess('need db in object') unless ($self->{'db'});
+       $self->confess('need attr') unless ($args->{'attr'});
 
-       $log->logconfess("need attr as array not " . ref($args->{'attr'}) ) unless (ref($args->{'attr'}) eq 'ARRAY');
+       $self->confess("need attr as array not " . ref($args->{'attr'}) ) unless (ref($args->{'attr'}) eq 'ARRAY');
 
        my $q = $args->{'query'};
 
@@ -163,7 +163,7 @@ sub search {
 
        $log->debug("results " . Dumper( \@results ));
 
-       $log->logconfess("expected to return array") unless (wantarray);
+       $self->confess("expected to return array") unless (wantarray);
 
        return @results;
 }
@@ -179,10 +179,11 @@ C<die>.
 sub confess {
        my $self = shift;
        if (my $log = $self->{'log'}) {
-               if ($log->can('confess')) {
-                       $log->confess(@_);
+               if ($log->can('logconfess')) {
+                       $log->logconfess(@_);
                } elsif ($log->can('fatal')) {
                        $log->fatal(@_);
+                       die @_;
                } elsif ($log->can('error')) {
                        $log->error(@_);
                } else {