From 9ee405935ad2ca4e06e8165f8f486f14a5bc8360 Mon Sep 17 00:00:00 2001 From: Nahuel Angelinetti Date: Fri, 10 Oct 2008 11:39:46 +0200 Subject: [PATCH][bug #2688][3.0.x] Report to user the connections errors to z39.50 server, like timeout(10007), and refused(10000). The error messages need to be translated. --- cataloguing/z3950_search.pl | 7 ++++++- .../prog/en/modules/cataloguing/z3950_search.tmpl | 3 +++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl index aa16706..f47f463 100755 --- a/cataloguing/z3950_search.pl +++ b/cataloguing/z3950_search.pl @@ -106,6 +106,7 @@ else { my @id = $input->param('id'); my @oConnection; my @oResult; + my @errconn; my $s = 0; my $query; my $nterms; @@ -199,6 +200,9 @@ warn "query ".$query if $DEBUG; my ( $error, $errmsg, $addinfo, $diagset ) = $oConnection[$k]->error_x(); if ($error) { + if ($error =~ m/^(10000|10007)$/ ) { + push(@errconn, {'server' => $serverhost[$k]}); + } warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n" if $DEBUG; @@ -263,8 +267,9 @@ warn "query ".$query if $DEBUG; breeding_loop => \@breeding_loop, server => $servername[$k], numberpending => $numberpending, + errconn => \@errconn, ); - + output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0; # print $template->output if $firstresult !=1; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl index 202d9bb..006c31e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl @@ -109,6 +109,9 @@ $.tablesorter.addParser({ + + Connection failed to +

Nothing found. Try another search.

-- 1.5.4.3