report error and don't die

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@657 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/WebPac.pm b/WebPac.pm
index 6a1c7ef..800833a 100644 (file)
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -359,9 +359,11 @@ sub show_results_list {
                $tmpl->param('full',0);
        }
 
+       my $swish_msg = ' ';
+
        # create new swish instance
        my $swish = SWISH::API->new($INDEX);
-       die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;
+       $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
 
        # execute query and get number of results from SWISH-E
        my $search = $swish->New_Search_Object;
@@ -369,12 +371,14 @@ sub show_results_list {
        $search->SetSort($sort);
 
        my $results = $search->Execute($sw_q);
-       die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;
+       $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
 
        my $hits = $results->Hits;
 
        $tmpl->param('hits',$hits);
-       $tmpl->param('search',$sw_q);
+       my $search_msg = $sw_q;
+       $search_msg .= '<em>'.$swish_msg.'</em>' if ($swish_msg);
+       $tmpl->param('search', $search_msg);
 
        $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
        $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);