Bugzilla – Attachment 27997 Details for
Bug 12198
Guarantor search makes incorrect and unnecessary call to GetMemberIssuesAndFines
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12198: (code cleanup) remove unused variables, tidy code
Bug-12198-code-cleanup-remove-unused-variables-tid.patch (text/plain), 5.46 KB, created by
Galen Charlton
on 2014-05-06 20:10:26 UTC
(
hide
)
Description:
Bug 12198: (code cleanup) remove unused variables, tidy code
Filename:
MIME Type:
Creator:
Galen Charlton
Created:
2014-05-06 20:10:26 UTC
Size:
5.46 KB
patch
obsolete
>From aef5ac274a1e47dfd0a45da383088b8c1b426998 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 6 May 2014 12:36:30 -0400 >Subject: [PATCH] Bug 12198: (code cleanup) remove unused variables, tidy code > >To test: > >[1] Perform searches for guarantors and verify that there > are no regressions. > >Signed-off-by: Galen Charlton <gmc@esilibrary.com> >--- > members/guarantor_search.pl | 127 ++++++++++++++++++++----------------------- > 1 file changed, 60 insertions(+), 67 deletions(-) > >diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl >index 42d36a7..6211cee 100755 >--- a/members/guarantor_search.pl >+++ b/members/guarantor_search.pl >@@ -1,6 +1,5 @@ > #!/usr/bin/perl > >- > # script to find a guarantor > > # Copyright 2006 OUEST PROVENCE >@@ -20,88 +19,82 @@ > # with Koha; if not, write to the Free Software Foundation, Inc., > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > >-use strict; >-#use warnings; FIXME - Bug 2505 >+use Modern::Perl; >+ >+use CGI; >+ > use C4::Auth; > use C4::Output; >-use CGI; > use C4::Dates qw/format_date/; > use C4::Members; > > my $input = new CGI; >-my ($template, $loggedinuser, $cookie); >- >- ($template, $loggedinuser, $cookie) >- = get_template_and_user({template_name => "members/guarantor_search.tmpl", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => {borrowers => 1}, >- debug => 1, >- }); >-# } >-my $theme = $input->param('theme') || "default"; >- # only used if allowthemeoverride is set >- >- >-my $member=$input->param('member'); >-my $orderby=$input->param('orderby'); >-my $category_type=$input->param('category_type'); >+my ( $template, $loggedinuser, $cookie ); >+ >+( $template, $loggedinuser, $cookie ) = get_template_and_user( >+ { >+ template_name => "members/guarantor_search.tmpl", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => { borrowers => 1 }, >+ debug => 1, >+ } >+); >+ >+my $member = $input->param('member'); >+my $orderby = $input->param('orderby'); >+my $category_type = $input->param('category_type'); >+ > $orderby = "surname,firstname" unless $orderby; >-$member =~ s/,//g; #remove any commas from search string >+$member =~ s/,//g; #remove any commas from search string > $member =~ s/\*/%/g; >-if ($member eq ''){ >- $template->param(results=>0); >-}else{ >- $template->param(results=>1); >-} >+ >+$template->param( results => $member ); > > my $search_category = 'A'; >-if ($category_type eq 'P'){ >- $search_category = 'I'; >+if ( $category_type eq 'P' ) { >+ $search_category = 'I'; > } > >-my ($count,$results); >+my ( $count, $results ); > my @resultsdata; >-my $background = 0; > >-if ($member ne ''){ >- $results = Search({''=>$member, category_type=>$search_category},$orderby); >+if ( $member ne '' ) { >+ $results = >+ Search( { '' => $member, category_type => $search_category }, $orderby ); >+ > $count = $results ? @$results : 0; > >- for (my $i=0; $i < $count; $i++){ >- #find out stats >- my $guarantorinfo=uc($results->[$i]{'surname'})." , ".ucfirst($results->[$i]{'firstname'}); >- my %row = ( >- background => $background, >- count => $i+1, >- borrowernumber => $results->[$i]{'borrowernumber'}, >- cardnumber => $results->[$i]{'cardnumber'}, >- surname => $results->[$i]{'surname'}, >- firstname => $results->[$i]{'firstname'}, >- categorycode => $results->[$i]{'categorycode'}, >- streetnumber => $results->[$i]{'streetnumber'}, >- address => $results->[$i]{'address'}, >- address2 => $results->[$i]{'address2'}, >- city => $results->[$i]{'city'}, >- state => $results->[$i]{'state'}, >- zipcode => $results->[$i]{'zipcode'}, >- country => $results->[$i]{'country'}, >- branchcode => $results->[$i]{'branchcode'}, >- guarantorinfo =>$guarantorinfo, >- #op >- dateofbirth =>format_date($results->[$i]{'dateofbirth'}), >- #fi op >- >- borrowernotes => $results->[$i]{'borrowernotes'}); >- if ( $background ) { $background = 0; } else {$background = 1; } >- push(@resultsdata, \%row); >- } >+ for ( my $i = 0 ; $i < $count ; $i++ ) { >+ my %row = ( >+ count => $i + 1, >+ borrowernumber => $results->[$i]{'borrowernumber'}, >+ cardnumber => $results->[$i]{'cardnumber'}, >+ surname => $results->[$i]{'surname'}, >+ firstname => $results->[$i]{'firstname'}, >+ categorycode => $results->[$i]{'categorycode'}, >+ streetnumber => $results->[$i]{'streetnumber'}, >+ address => $results->[$i]{'address'}, >+ address2 => $results->[$i]{'address2'}, >+ city => $results->[$i]{'city'}, >+ state => $results->[$i]{'state'}, >+ zipcode => $results->[$i]{'zipcode'}, >+ country => $results->[$i]{'country'}, >+ branchcode => $results->[$i]{'branchcode'}, >+ dateofbirth => format_date( $results->[$i]{'dateofbirth'} ), >+ borrowernotes => $results->[$i]{'borrowernotes'} >+ ); >+ >+ push( @resultsdata, \%row ); >+ } > } >-$template->param( >- member => $member, >- numresults => $count, >- category_type => $category_type, >- resultsloop => \@resultsdata ); >+ >+$template->param( >+ member => $member, >+ numresults => $count, >+ category_type => $category_type, >+ resultsloop => \@resultsdata >+); > > output_html_with_http_headers $input, $cookie, $template->output; >-- >1.7.10.4
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 12198
:
27988
|
27989
|
27996
|
27997
|
27998
|
28108
|
28109
|
28110