Bugzilla – Attachment 22164 Details for
Bug 5670
Housebound Readers Module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Remove unused variables from C4::Housebound
Remove-unused-variables-from-C4Housebound.patch (text/plain), 9.70 KB, created by
Martin Renvoize (ashimema)
on 2013-10-21 16:11:18 UTC
(
hide
)
Description:
Remove unused variables from C4::Housebound
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2013-10-21 16:11:18 UTC
Size:
9.70 KB
patch
obsolete
>From d9a44406efe8a699c4a34ed69ef7533b590f7ae1 Mon Sep 17 00:00:00 2001 >From: Colin Campbell <colin.campbell@ptfs-europe.com> >Date: Fri, 9 Nov 2012 12:22:08 +0000 >Subject: [PATCH] Remove unused variables from C4::Housebound > >localized lexical vars to where they are used >Avoided unnecessary method calls >Remove a finish >No need to interpolate to constant strings >Fix some violations of perlstyle > >http://bugs.koha-community.org/show_bug.cgi?id=5670 >--- > C4/Housebound.pm | 125 +++++++++++++++++++++--------------------------------- > 1 file changed, 49 insertions(+), 76 deletions(-) > >diff --git a/C4/Housebound.pm b/C4/Housebound.pm >index 28906ce..9a4207b 100644 >--- a/C4/Housebound.pm >+++ b/C4/Housebound.pm >@@ -23,7 +23,6 @@ use C4::Context; > use parent qw(Exporter); > > our $VERSION = 3.02; >-our $debug = $ENV{DEBUG} || 0; > our @EXPORT = qw( > GetHouseboundDetails > CreateHouseboundDetails >@@ -75,14 +74,12 @@ $notes - freetext notes containing useful information about the patron (e.g. > > sub GetHouseboundDetails { > my ($borrowernumber) = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($borrowernumber) { >- $sth = $dbh->prepare("select * from housebound where borrowernumber=?"); >+ my $dbh = C4::Context->dbh; >+ my $sth = >+ $dbh->prepare('select * from housebound where borrowernumber=?'); > $sth->execute($borrowernumber); >- my $housebound = $sth->fetchrow_hashref; >- return $housebound; >+ return $sth->fetchrow_hashref; > } > return; > } >@@ -91,12 +88,10 @@ sub CreateHouseboundDetails { > my ( $borrowernumber, $day, $frequency, $Itype_quant, $Item_subject, > $Item_authors, $referral, $notes ) > = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($borrowernumber) { >- $sth = $dbh->prepare( >-"insert into housebound (day, frequency, borrowernumber, Itype_quant, Item_subject, Item_authors, referral, notes) values (?,?,?,?,?,?,?,?)" >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare( >+'insert into housebound (day, frequency, borrowernumber, Itype_quant, Item_subject, Item_authors, referral, notes) values (?,?,?,?,?,?,?,?)' > ); > $sth->execute( $day, $frequency, $borrowernumber, $Itype_quant, > $Item_subject, $Item_authors, $referral, $notes ); >@@ -105,16 +100,15 @@ sub CreateHouseboundDetails { > } > > sub UpdateHouseboundDetails { >- my ($hbnumber, $borrowernumber, $day, >+ my ( >+ $hbnumber, $borrowernumber, $day, > $frequency, $Itype_quant, $Item_subject, > $Item_authors, $referral, $notes > ) = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($hbnumber) { >- $sth = $dbh->prepare( >-"update housebound set day=?,frequency=?,borrowernumber=?,Itype_quant=?,Item_subject=?,Item_authors=?,referral=?,notes=? where hbnumber=?" >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare( >+'update housebound set day=?,frequency=?,borrowernumber=?,Itype_quant=?,Item_subject=?,Item_authors=?,referral=?,notes=? where hbnumber=?' > ); > $sth->execute( > $day, $frequency, $borrowernumber, >@@ -127,14 +121,10 @@ sub UpdateHouseboundDetails { > > sub GetCurrentHouseboundInstanceList { > my ($borrowernumber) = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($borrowernumber) { >- >-#$sth = $dbh->prepare("select * from housebound_instance where borrowernumber=?"); >- $sth = $dbh->prepare( >-"SELECT housebound_instance . * , concat( volunteer.firstname, ' ', volunteer.surname ) AS vol, concat(chooser.firstname, ' ', chooser.surname) as cho, concat(deliverer.firstname, ' ', deliverer.surname) as del FROM housebound_instance left JOIN borrowers volunteer ON volunteer.borrowernumber = housebound_instance.volunteer left join borrowers chooser on chooser.borrowernumber = housebound_instance.chooser left join borrowers deliverer on deliverer.borrowernumber = housebound_instance.deliverer where housebound_instance.borrowernumber=? order by housebound_instance.dmy desc" >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare( >+q|SELECT housebound_instance . * , concat( volunteer.firstname, ' ', volunteer.surname ) AS vol, concat(chooser.firstname, ' ', chooser.surname) as cho, concat(deliverer.firstname, ' ', deliverer.surname) as del FROM housebound_instance left JOIN borrowers volunteer ON volunteer.borrowernumber = housebound_instance.volunteer left join borrowers chooser on chooser.borrowernumber = housebound_instance.chooser left join borrowers deliverer on deliverer.borrowernumber = housebound_instance.deliverer where housebound_instance.borrowernumber=? order by housebound_instance.dmy desc| > ); > $sth->execute($borrowernumber); > my $housebound_instances = $sth->fetchall_arrayref( {} ); >@@ -145,11 +135,9 @@ sub GetCurrentHouseboundInstanceList { > > sub GetVolunteerNameAndID { > my ($borrowernumber) = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($borrowernumber) { >- $sth = $dbh->prepare( >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare( > "select borrowernumber,title,firstname,surname from borrowers where borrowernumber=?" > ); > $sth->execute($borrowernumber); >@@ -161,27 +149,21 @@ sub GetVolunteerNameAndID { > > sub GetVolunteerList { > my $dbh = C4::Context->dbh; >- my $query; >- my $sth; >- $sth = $dbh->prepare( >-"SELECT borrowernumber as volbornumber, concat(title, ' ', firstname, ' ', surname) as fullname from borrowers where categorycode='VOL' order by surname, firstname asc" >+ my $sth = $dbh->prepare( >+q|SELECT borrowernumber as volbornumber, concat(title, ' ', firstname, ' ', surname) as fullname from borrowers where categorycode='VOL' order by surname, firstname asc| > ); > $sth->execute(); >- my $volunteers = $sth->fetchall_arrayref( {} ); >- return $volunteers; >+ return $sth->fetchall_arrayref( {} ); > } > > sub GetHouseboundInstanceDetails { > my ($instanceid) = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($instanceid) { >- $sth = >- $dbh->prepare("SELECT * from housebound_instance where instanceid=?"); >+ my $dbh = C4::Context->dbh; >+ my $sth = >+ $dbh->prepare('SELECT * from housebound_instance where instanceid=?'); > $sth->execute($instanceid); >- my $instancedetails = $sth->fetchrow_hashref; >- return $instancedetails; >+ return $sth->fetchrow_hashref; > } > > # return undef if no instanceid >@@ -192,12 +174,10 @@ sub UpdateHouseboundInstanceDetails { > my ( $instanceid, $hbnumber, $dmy, $time, $borrowernumber, $volunteer, > $chooser, $deliverer ) > = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($hbnumber) { >- $sth = $dbh->prepare( >-"update housebound_instance set hbnumber=?, dmy=?, time=?, borrowernumber=?, volunteer=?, chooser=?, deliverer=? where instanceid=?" >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare( >+'update housebound_instance set hbnumber=?, dmy=?, time=?, borrowernumber=?, volunteer=?, chooser=?, deliverer=? where instanceid=?' > ); > $sth->execute( $hbnumber, $dmy, $time, $borrowernumber, $volunteer, > $chooser, $deliverer, $instanceid ); >@@ -209,12 +189,10 @@ sub CreateHouseboundInstanceDetails { > my ( $hbnumber, $dmy, $time, $borrowernumber, $volunteer, $chooser, > $deliverer ) > = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($borrowernumber) { >- $sth = $dbh->prepare( >-"insert into housebound_instance (hbnumber, dmy, time, borrowernumber, volunteer, chooser, deliverer) values (?,?,?,?,?,?,?)" >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare( >+'insert into housebound_instance (hbnumber, dmy, time, borrowernumber, volunteer, chooser, deliverer) values (?,?,?,?,?,?,?)' > ); > $sth->execute( $hbnumber, $dmy, $time, $borrowernumber, $volunteer, > $chooser, $deliverer ); >@@ -224,39 +202,34 @@ sub CreateHouseboundInstanceDetails { > > sub DeleteHouseboundInstanceDetails { > my ($instanceid) = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $sth; > if ($instanceid) { >- $sth = >- $dbh->prepare("delete from housebound_instance where instanceid=?"); >+ my $dbh = C4::Context->dbh; >+ my $sth = >+ $dbh->prepare('delete from housebound_instance where instanceid=?'); > $sth->execute($instanceid); > } > return; > } > > sub CheckPrevIssue { >- my ($borrowernumber,$biblionumber) = @_; >- my $dbh = C4::Context->dbh; >- my $query; >- my $item; >- my $sth; >- my $previssue=0; >- $sth = $dbh->prepare("select itemnumber from items where biblionumber=?"); >+ my ( $borrowernumber, $biblionumber ) = @_; >+ my $dbh = C4::Context->dbh; >+ my $previssue = 0; >+ my $sth = >+ $dbh->prepare('select itemnumber from items where biblionumber=?'); > $sth->execute($biblionumber); >- while(my @row=$sth->fetchrow_array()) >- { >- $query = $dbh->prepare("select count(itemnumber) from old_issues where borrowernumber=? and itemnumber=?"); >- $query->execute($borrowernumber,$row[0]); >- while(my @matches=$query->fetchrow_array()) >- { >- if ($matches[0]>0) >- { >- $previssue=1; >- } >- } >+ >+ my $query = $dbh->prepare( >+'select count(itemnumber) from old_issues where borrowernumber=? and itemnumber=?' >+ ); >+ while ( my @row = $sth->fetchrow_array() ) { >+ $query->execute( $borrowernumber, $row[0] ); >+ while ( my @matches = $query->fetchrow_array() ) { >+ if ( $matches[0] > 0 ) { >+ $previssue = 1; >+ } >+ } > } >- $sth->finish; > return $previssue; > } > >-- >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 5670
:
3038
|
22162
|
22163
|
22164
|
22165
|
26816
|
27288
|
50930
|
51377
|
51875
|
54384
|
54385
|
55326
|
55334
|
55335
|
55336
|
55734
|
55735
|
55736
|
55737
|
55738
|
55739
|
55865
|
55866
|
55867
|
55890
|
55891
|
56298
|
56299
|
56300
|
56301
|
56302
|
56308
|
56337
|
56341
|
56346
|
56347
|
56348
|
56349
|
56350
|
56351
|
56352
|
56353
|
56354
|
56355
|
56356
|
56357
|
56358
|
56359
|
56360
|
56361
|
56362
|
56363
|
56364
|
56365
|
56366
|
56367
|
56368
|
56369
|
56580
|
56581
|
56582
|
56583
|
56584
|
56585
|
56586
|
56587
|
56588
|
56589
|
56590
|
56591
|
56592
|
56593
|
56594
|
56595
|
56596
|
56597
|
56598
|
56599
|
56600
|
56601
|
56602
|
56603
|
56604
|
56605
|
56606