Bugzilla – Attachment 793 Details for
Bug 2688
Z39.50 should report connection failures even if some succeeded
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for 3.0.x
0001-Report-to-user-the-connections-errors-to-z39.50-serv.patch (text/plain), 2.34 KB, created by
Chris Cormack
on 2008-10-17 00:43:00 UTC
(
hide
)
Description:
Patch for 3.0.x
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2008-10-17 00:43:00 UTC
Size:
2.34 KB
patch
obsolete
>From 9ee405935ad2ca4e06e8165f8f486f14a5bc8360 Mon Sep 17 00:00:00 2001 >From: Nahuel Angelinetti <nahuel.angelinetti@biblibre.com> >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({ > <!-- /TMPL_LOOP --></tbody> > </table> > <!-- TMPL_ELSE --> >+ <!-- TMPL_LOOP name="errconn" --> >+ Connection failed to <!-- TMPL_VAR NAME="server" --> >+ <!-- /TMPL_LOOP --> > <p>Nothing found. <a href="/cgi-bin/koha/cataloguing/z3950_search.pl">Try another search</a>.</p> > <!-- /TMPL_IF --> > >-- >1.5.4.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2688
:
792
|
793