Attachment 14232 Details for Bug 9105 – Bug 9105: Second housekeeping followup

[patch] Bug 9105: Second housekeeping followup

Bug-9105-Second-housekeeping-followup.patch (text/plain), 3.70 KB, created by Paul Poulain on 2012-12-21 14:39:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Poulain

Created: 2012-12-21 14:39:47 UTC

Size: 3.70 KB

patch

obsolete

>From 78113e113ee3b945fc2e8b18c18efd4321ede990 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] Bug 9105: Second housekeeping followup
>
>Removing some unused variables.
>Restoring timeout parameter that was only used in cataloging.
>Restoring copyrightdate and editionstatement in row data for template.
>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.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
>---
> C4/Breeding.pm |   25 +++++++++----------------
> 1 file changed, 9 insertions(+), 16 deletions(-)
>
>diff --git a/C4/Breeding.pm b/C4/Breeding.pm
>index bb9054e..f82ecf8 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);
>@@ -392,6 +389,8 @@ sub Z3950Search {
>                             $row_data{lccn}         = $oldbiblio->{lccn};
>                             $row_data{title}        = $oldbiblio->{title};
>                             $row_data{author}       = $oldbiblio->{author};
>+                            $row_data{date}         = $oldbiblio->{copyrightdate};
>+                            $row_data{edition}      = $oldbiblio->{editionstatement};
>                             $row_data{breedingid}   = $breedingid;
>                             $row_data{biblionumber} = $biblionumber;
>                             push( @breeding_loop, \%row_data );
>@@ -403,29 +402,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.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 9105: 13589 | 13590 | 13593 | 13594 | 13625 | 13626 | 13936 | 13937 | 13938 | 14230 | 14231 | 14232 | 14450 | 14701 | 15222