Hi,
This patch does not apply - please rebase and resubmit it.
Regards,
Galen
On Fri, Oct 10, 2008 at 5:42 AM, Nahuel Angelinetti
<[EMAIL PROTECTED]> wrote:
> ---
> 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 => [EMAIL PROTECTED],
> server => $servername[$k],
> numberpending => $numberpending,
> + errconn => [EMAIL PROTECTED],
> );
> -
> +
> 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
>
> _______________________________________________
> Koha-patches mailing list
> [email protected]
> http://lists.koha.org/mailman/listinfo/koha-patches
>
--
Galen Charlton
VP, Research & Development, LibLime
[EMAIL PROTECTED]
p: 1-888-564-2457 x709
skype: gmcharlt
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
