Bugzilla – Attachment 13625 Details for
Bug 9105
Moving Z3950 search code to Breeding.pm
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Second (housekeeping) patch
patch.txt (text/plain), 2.96 KB, created by
Marcel de Rooy
on 2012-11-22 09:23:06 UTC
(
hide
)
Description:
Second (housekeeping) patch
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2012-11-22 09:23:06 UTC
Size:
2.96 KB
patch
obsolete
>From 19380a8ba5193c21e9d1ddb540d5da727d2ed4ed Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 22 Nov 2012 09:32:42 +0100 >Subject: [PATCH] 9105c Second followup for Moving Z3950 search code to Breeding >Content-Type: text/plain; charset="utf-8" > >Removing some unused variables. >Restoring timeout parameter that was only used in cataloging. >Small adjustment at the end of the while loop with template vars. > >Discovered while doing so, that the paging feature needs some further corrections; will propose a patch under a separate report. >--- > C4/Breeding.pm | 23 +++++++---------------- > 1 files changed, 7 insertions(+), 16 deletions(-) > >diff --git a/C4/Breeding.pm b/C4/Breeding.pm >index bb9054e..c6a9ad9 100644 >--- a/C4/Breeding.pm >+++ b/C4/Breeding.pm >@@ -244,11 +244,9 @@ sub Z3950Search { > my $lccall= $pars->{lccall}; > my $controlnumber= $pars->{controlnumber}; > >- > my $show_next = 0; > my $total_pages = 0; > >- my $noconnection; > my $attr = ''; > my $term; > my $host; >@@ -259,7 +257,6 @@ sub Z3950Search { > my @encoding; > my @results; > my $count; >- my $toggle; > my $record; > my $oldbiblio; > my @serverhost; >@@ -329,6 +326,7 @@ sub Z3950Search { > $option1->option( 'password', $server->{password} ) > if $server->{password}; > $option1->option( 'preferredRecordSyntax', $server->{syntax} ); >+ $option1->option( 'timeout', $server->{timeout} ) if $server->{timeout}; > $oConnection[$s] = create ZOOM::Connection($option1); > $oConnection[$s]->connect( $server->{host}, $server->{port} ); > $serverhost[$s] = $server->{host}; >@@ -338,7 +336,6 @@ sub Z3950Search { > } ## while fetch > } # foreach > my $nremaining = $s; >- my $firstresult = 1; > > for ( my $z = 0 ; $z < $s ; $z++ ) { > $oResult[$z] = $oConnection[$z]->search_pqf($query); >@@ -403,29 +400,23 @@ sub Z3950Search { > } #if $numresults > } > } # if $k !=0 >- my $numberpending = $nremaining - 1; >- >- my @servers = (); >- foreach my $id (@id) { >- push(@servers,{id => $id}); >- } > > $template->param( >- breeding_loop => \@breeding_loop, >- server => $servername[$k], >- numberpending => $numberpending, >+ numberpending => $nremaining, > current_page => $page, >- servers => \@servers, > total_pages => $total_pages, > show_nextbutton => $show_next?1:0, > show_prevbutton => $page!=1, > ); >- $firstresult++; > } # while nremaining > >+ my @servers = (); >+ foreach my $id (@id) { >+ push @servers, {id => $id}; >+ } > $template->param( > breeding_loop => \@breeding_loop, >- numberpending => $nremaining > 0 ? $nremaining : 0, >+ servers => \@servers, > errconn => \@errconn > ); > } >-- >1.7.7.6 >
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 9105
:
13589
|
13590
|
13593
|
13594
|
13625
|
13626
|
13936
|
13937
|
13938
|
14230
|
14231
|
14232
|
14450
|
14701
|
15222