Attachment 22907 Details for Bug 7419 – Zconn fix, works with Julian Maurice patchs

[patch] Zconn fix, works with Julian Maurice patchs

0001-LOCAL-Fix-C4-Context-Zconn.patch (text/plain), 1.92 KB, created by Stéphane Delaune on 2013-11-13 14:13:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stéphane Delaune

Created: 2013-11-13 14:13:14 UTC

Size: 1.92 KB

patch

obsolete

>From 44e1cc9231defc92a5627628e8f551e0f6733a52 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 13 Nov 2013 14:21:40 +0100
>Subject: [PATCH] [LOCAL] Fix C4::Context::Zconn()
>
>---
> C4/Context.pm |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/C4/Context.pm b/C4/Context.pm
>index bd1f235..bbcba61 100644
>--- a/C4/Context.pm
>+++ b/C4/Context.pm
>@@ -673,8 +673,8 @@ sub Zconn {
>     my $auth=shift;
>     my $piggyback=shift;
>     my $syntax=shift;
>-    if ( defined($context->{"Zconn"}->{$server}) && (0 == $context->{"Zconn"}->{$server}->errcode()) ) {
>-        return $context->{"Zconn"}->{$server};
>+    if ( defined($context->{"Zconn"}->{$server}->{$async}) && (0 == $context->{"Zconn"}->{$server}->{$async}->errcode()) ) {
>+        return $context->{"Zconn"}->{$server}->{$async};
>     # No connection object or it died. Create one.
>     }else {
>         # release resources if we're closing a connection and making a new one
>@@ -683,12 +683,12 @@ sub Zconn {
>         # and make a new one, particularly for a batch job.  However, at
>         # first glance it does not look like there's a way to easily check
>         # the basic health of a ZOOM::Connection
>-        $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
>+        $context->{"Zconn"}->{$server}->{$async}->destroy() if defined($context->{"Zconn"}->{$server}->{$async});
> 
>-        $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
>-        $context->{ Zconn }->{ $server }->option(
>+        $context->{"Zconn"}->{$server}->{$async} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
>+        $context->{ Zconn }->{ $server }->{$async}->option(
>             preferredRecordSyntax => C4::Context->preference("marcflavour") );
>-        return $context->{"Zconn"}->{$server};
>+        return $context->{"Zconn"}->{$server}->{$async};
>     }
> }
> 
>-- 
>1.7.2.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 7419: 11161 | 11162 | 11412 | 11413 | 11486 | 11487 | 11488 | 13073 | 13074 | 13629 | 13630 | 17790 | 17791 | 17792 | 18712 | 18713 | 18714 | 20783 | 20784 | 20785 | 22150 | 22907 | 25087 | 25088 | 25089 | 35886 | 35887 | 35888 | 35889 | 42972