Attachment 70193 Details for Bug 11297 – Bug 11297: QA follow-up - Avoid carrying server attributes

[patch] Bug 11297: QA follow-up - Avoid carrying server attributes

Bug-11297-QA-follow-up---Avoid-carrying-server-att.patch (text/plain), 1.34 KB, created by Charles Farmer on 2017-12-28 20:56:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charles Farmer

Created: 2017-12-28 20:56:06 UTC

Size: 1.34 KB

patch

obsolete

>From 1f606cc5539ff16f11fcef046adab55a2d386aa8 Mon Sep 17 00:00:00 2001
>From: charles <charles@inlibro.com>
>Date: Thu, 28 Dec 2017 15:23:03 -0500
>Subject: [PATCH] Bug 11297: QA follow-up - Avoid carrying server attributes
>
>As it was pointed out, concatenating server attributes on a variable above the foreach loop meant carrying those attributes through every other queries.
>
>With a variable local to the loop, we can now send each server its specific zquery.
>---
> C4/Breeding.pm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Breeding.pm b/C4/Breeding.pm
>index f157587..646ac11 100644
>--- a/C4/Breeding.pm
>+++ b/C4/Breeding.pm
>@@ -156,13 +156,14 @@ sub Z3950Search {
>     );
>     my @servers = $rs->all;
>     foreach my $server ( @servers ) {
>+        my $server_zquery = $zquery;
>         if(my $attributes = $server->{attributes}){
>-            $zquery = "$attributes $zquery";
>+            $server_zquery = "$attributes $zquery";
>         }
>         $oConnection[$s] = _create_connection( $server );
>         $oResult[$s] =
>             $server->{servertype} eq 'zed'?
>-                $oConnection[$s]->search_pqf( $zquery ):
>+                $oConnection[$s]->search_pqf( $server_zquery ):
>                 $oConnection[$s]->search(new ZOOM::Query::CQL(
>                     _translate_query( $server, $squery )));
>         $s++;
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 11297: 23144 | 23145 | 40829 | 40889 | 48649 | 50415 | 50416 | 50420 | 50954 | 59448 | 62938 | 62939 | 70190 | 70191 | 70192 | 70193 | 70194 | 70195 | 70196 | 71992 | 71993 | 71994 | 72061 | 72062 | 72063 | 77718 | 77719 | 77720 | 77721 | 77722 | 77723 | 78294 | 78295 | 78296 | 78297 | 80372 | 80496 | 80497 | 80498 | 80499 | 81328 | 81342 | 81343 | 81344 | 81345 | 81346 | 92719 | 92720 | 92721 | 92722 | 98598 | 98599 | 98600 | 98601 | 99227 | 99228 | 99229 | 99230 | 99231