Bugzilla – Attachment 18765 Details for
Bug 10256
Remove some unused subs from Overdues module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10256: Remove some unused subs from Overdues module
Bug-10256-Remove-some-unused-subs-from-Overdues-mo.patch (text/plain), 13.89 KB, created by
Kyle M Hall (khall)
on 2013-06-07 16:17:19 UTC
(
hide
)
Description:
Bug 10256: Remove some unused subs from Overdues module
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-06-07 16:17:19 UTC
Size:
13.89 KB
patch
obsolete
>From 0bf1676de171ff92c9c2a9e532dee4711819797b Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 16 May 2013 09:52:41 +0200 >Subject: [PATCH] Bug 10256: Remove some unused subs from Overdues module > >Removes the following exported but unused subs from Overdues.pm: >CreateItemAccountLine >UpdateAccountLines >CheckAccountLineLevelInfo >CheckAccountLineItemInfo >CheckExistantNotifyid >GetNextIdNotify >GetNotifyId >ReplacementCost >ReplacementCost2 >GetOverdueDelays >GetOverduerules > >Test plan: >It is hard to test the removal of something that was not used :) Try this: >Do a recursive grep on these routine names in the Koha codebase. >Compile some scripts that use the Overdues module. >And just to be sure we do not break something: >Go to Circulation: Do a checkout, checkin, place and confirm a hold. >Go to Patrons: Goto Check out. Goto Fines. >Run the command line scripts: fines.pl and overdue_notices.pl. >Go to opac-user.pl. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Overdues.pm | 362 ------------------------------- > t/db_dependent/lib/KohaTest/Overdues.pm | 9 - > 2 files changed, 0 insertions(+), 371 deletions(-) > >diff --git a/C4/Overdues.pm b/C4/Overdues.pm >index 9c05668..4fd0b84 100644 >--- a/C4/Overdues.pm >+++ b/C4/Overdues.pm >@@ -41,20 +41,10 @@ BEGIN { > &CalcFine > &Getoverdues > &checkoverdues >- &CheckAccountLineLevelInfo >- &CheckAccountLineItemInfo >- &CheckExistantNotifyid >- &GetNextIdNotify >- &GetNotifyId > &NumberNotifyId > &AmountNotify >- &UpdateAccountLines > &UpdateFine >- &GetOverdueDelays >- &GetOverduerules > &GetFine >- &CreateItemAccountLine >- &ReplacementCost2 > > &CheckItemNotify > &GetOverduesForBranch >@@ -79,7 +69,6 @@ BEGIN { > # subs to move to Biblio.pm > push @EXPORT, qw( > &GetItems >- &ReplacementCost > ); > } > >@@ -630,7 +619,6 @@ category he or she belongs to. > > =cut > >-#' > sub BorType { > my ($borrowernumber) = @_; > my $dbh = C4::Context->dbh; >@@ -643,27 +631,6 @@ sub BorType { > return $sth->fetchrow_hashref; > } > >-=head2 ReplacementCost >- >- $cost = &ReplacementCost($itemnumber); >- >-Returns the replacement cost of the item with the given item number. >- >-=cut >- >-#' >-sub ReplacementCost { >- my ($itemnum) = @_; >- my $dbh = C4::Context->dbh; >- my $sth = >- $dbh->prepare("Select replacementprice from items where itemnumber=?"); >- $sth->execute($itemnum); >- >- # FIXME - Use fetchrow_array or a slice. >- my $data = $sth->fetchrow_hashref; >- return ( $data->{'replacementprice'} ); >-} >- > =head2 GetFine > > $data->{'sum(amountoutstanding)'} = &GetFine($itemnum,$borrowernumber); >@@ -676,7 +643,6 @@ C<$borrowernumber> is the borrowernumber > > =cut > >- > sub GetFine { > my ( $itemnum, $borrowernumber ) = @_; > my $dbh = C4::Context->dbh(); >@@ -692,61 +658,6 @@ sub GetFine { > return 0; > } > >-sub ReplacementCost2 { >- my ( $itemnum, $borrowernumber ) = @_; >- my $dbh = C4::Context->dbh(); >- my $query = "SELECT amountoutstanding >- FROM accountlines >- WHERE accounttype like 'L' >- AND amountoutstanding > 0 >- AND itemnumber = ? >- AND borrowernumber= ?"; >- my $sth = $dbh->prepare($query); >- $sth->execute( $itemnum, $borrowernumber ); >- my $data = $sth->fetchrow_hashref(); >- return ( $data->{'amountoutstanding'} ); >-} >- >- >-=head2 GetNextIdNotify >- >- ($result) = &GetNextIdNotify($reference); >- >-Returns the new file number >- >-C<$result> contains the next file number >- >-C<$reference> contains the beggining of file number >- >-=cut >- >-sub GetNextIdNotify { >- my ($reference) = @_; >- my $query = qq|SELECT max(notify_id) >- FROM accountlines >- WHERE notify_id like \"$reference%\" >- |; >- >- # AND borrowernumber=?|; >- my $dbh = C4::Context->dbh; >- my $sth = $dbh->prepare($query); >- $sth->execute(); >- my $result = $sth->fetchrow; >- my $count; >- if ( $result eq '' ) { >- ( $result = $reference . "01" ); >- } >- else { >- $count = substr( $result, 6 ) + 1; >- >- if ( $count < 10 ) { >- ( $count = "0" . $count ); >- } >- $result = $reference . $count; >- } >- return $result; >-} >- > =head2 NumberNotifyId > > (@notify) = &NumberNotifyId($borrowernumber); >@@ -799,135 +710,6 @@ sub AmountNotify{ > return ($totalnotify); > } > >- >-=head2 GetNotifyId >- >- ($notify_id) = &GetNotifyId($borrowernumber,$itemnumber); >- >-Returns the file number per borrower and itemnumber >- >-C<$borrowernumber> is a reference-to-hash whose keys are all of the fields >-from the items tables of the Koha database. Thus, >- >-C<$itemnumber> contains the borrower categorycode >- >-C<$notify_id> contains the file number for the borrower number nad item number >- >-=cut >- >-sub GetNotifyId { >- my ( $borrowernumber, $itemnumber ) = @_; >- my $query = qq|SELECT notify_id >- FROM accountlines >- WHERE borrowernumber=? >- AND itemnumber=? >- AND (accounttype='FU' or accounttype='O')|; >- my $dbh = C4::Context->dbh; >- my $sth = $dbh->prepare($query); >- $sth->execute( $borrowernumber, $itemnumber ); >- my ($notify_id) = $sth->fetchrow; >- $sth->finish; >- return ($notify_id); >-} >- >-=head2 CreateItemAccountLine >- >- () = &CreateItemAccountLine($borrowernumber, $itemnumber, $date, $amount, >- $description, $accounttype, $amountoutstanding, >- $timestamp, $notify_id, $level); >- >-update the account lines with file number or with file level >- >-C<$items> is a reference-to-hash whose keys are all of the fields >-from the items tables of the Koha database. Thus, >- >-C<$itemnumber> contains the item number >- >-C<$borrowernumber> contains the borrower number >- >-C<$date> contains the date of the day >- >-C<$amount> contains item price >- >-C<$description> contains the descritpion of accounttype >- >-C<$accounttype> contains the account type >- >-C<$amountoutstanding> contains the $amountoutstanding >- >-C<$timestamp> contains the timestamp with time and the date of the day >- >-C<$notify_id> contains the file number >- >-C<$level> contains the file level >- >-=cut >- >-sub CreateItemAccountLine { >- my ( >- $borrowernumber, $itemnumber, $date, $amount, >- $description, $accounttype, $amountoutstanding, $timestamp, >- $notify_id, $level >- ) = @_; >- my $dbh = C4::Context->dbh; >- my $nextaccntno = C4::Accounts::getnextacctno($borrowernumber); >- my $query = "INSERT into accountlines >- (borrowernumber,accountno,itemnumber,date,amount,description,accounttype,amountoutstanding,timestamp,notify_id,notify_level) >- VALUES >- (?,?,?,?,?,?,?,?,?,?,?)"; >- >- my $sth = $dbh->prepare($query); >- $sth->execute( >- $borrowernumber, $nextaccntno, $itemnumber, >- $date, $amount, $description, >- $accounttype, $amountoutstanding, $timestamp, >- $notify_id, $level >- ); >-} >- >-=head2 UpdateAccountLines >- >- () = &UpdateAccountLines($notify_id,$notify_level,$borrowernumber,$itemnumber); >- >-update the account lines with file number or with file level >- >-C<$items> is a reference-to-hash whose keys are all of the fields >-from the items tables of the Koha database. Thus, >- >-C<$itemnumber> contains the item number >- >-C<$notify_id> contains the file number >- >-C<$notify_level> contains the file level >- >-C<$borrowernumber> contains the borrowernumber >- >-=cut >- >-sub UpdateAccountLines { >- my ( $notify_id, $notify_level, $borrowernumber, $itemnumber ) = @_; >- my $query; >- if ( $notify_id eq '' ) { >- $query = qq|UPDATE accountlines >- SET notify_level=? >- WHERE borrowernumber=? AND itemnumber=? >- AND (accounttype='FU' or accounttype='O')|; >- } else { >- $query = qq|UPDATE accountlines >- SET notify_id=?, notify_level=? >- WHERE borrowernumber=? >- AND itemnumber=? >- AND (accounttype='FU' or accounttype='O')|; >- } >- >- my $sth = C4::Context->dbh->prepare($query); >- if ( $notify_id eq '' ) { >- $sth->execute( $notify_level, $borrowernumber, $itemnumber ); >- } else { >- $sth->execute( $notify_id, $notify_level, $borrowernumber, $itemnumber ); >- } >-} >- > =head2 GetItems > > ($items) = &GetItems($itemnumber); >@@ -957,29 +739,6 @@ sub GetItems { > return ($items); > } > >-=head2 GetOverdueDelays >- >- (@delays) = &GetOverdueDelays($categorycode); >- >-Returns the list of all delays from overduerules. >- >-C<@delays> it's an array contains the three delays from overduerules table >- >-C<$categorycode> contains the borrower categorycode >- >-=cut >- >-sub GetOverdueDelays { >- my ($category) = @_; >- my $query = qq|SELECT delay1,delay2,delay3 >- FROM overduerules >- WHERE categorycode=?|; >- my $sth = C4::Context->dbh->prepare($query); >- $sth->execute($category); >- my (@delays) = $sth->fetchrow_array; >- return (@delays); >-} >- > =head2 GetBranchcodesWithOverdueRules > > my @branchcodes = C4::Overdues::GetBranchcodesWithOverdueRules() >@@ -1000,67 +759,6 @@ sub GetBranchcodesWithOverdueRules { > return @branches; > } > >-=head2 CheckAccountLineLevelInfo >- >- ($exist) = &CheckAccountLineLevelInfo($borrowernumber,$itemnumber,$accounttype,notify_level); >- >-Check and Returns the list of all overdue books. >- >-C<$exist> contains number of line in accounlines >-with the same .biblionumber,itemnumber,accounttype,and notify_level >- >-C<$borrowernumber> contains the borrower number >- >-C<$itemnumber> contains item number >- >-C<$accounttype> contains account type >- >-C<$notify_level> contains the accountline level >- >- >-=cut >- >-sub CheckAccountLineLevelInfo { >- my ( $borrowernumber, $itemnumber, $level ) = @_; >- my $dbh = C4::Context->dbh; >- my $query = qq|SELECT count(*) >- FROM accountlines >- WHERE borrowernumber =? >- AND itemnumber = ? >- AND notify_level=?|; >- my $sth = $dbh->prepare($query); >- $sth->execute( $borrowernumber, $itemnumber, $level ); >- my ($exist) = $sth->fetchrow; >- return ($exist); >-} >- >-=head2 GetOverduerules >- >- ($overduerules) = &GetOverduerules($categorycode); >- >-Returns the value of borrowers (debarred or not) with notify level >- >-C<$overduerules> return value of debbraed field in overduerules table >- >-C<$category> contains the borrower categorycode >- >-C<$notify_level> contains the notify level >- >-=cut >- >-sub GetOverduerules { >- my ( $category, $notify_level ) = @_; >- my $dbh = C4::Context->dbh; >- my $query = qq|SELECT debarred$notify_level >- FROM overduerules >- WHERE categorycode=?|; >- my $sth = $dbh->prepare($query); >- $sth->execute($category); >- my ($overduerules) = $sth->fetchrow; >- return ($overduerules); >-} >- >- > =head2 CheckBorrowerDebarred > > ($debarredstatus) = &CheckBorrowerDebarred($borrowernumber); >@@ -1090,66 +788,6 @@ sub CheckBorrowerDebarred { > } > > >-=head2 CheckExistantNotifyid >- >- ($exist) = &CheckExistantNotifyid($borrowernumber,$itemnumber,$accounttype,$notify_id); >- >-Check and Returns the notify id if exist else return 0. >- >-C<$exist> contains a notify_id >- >-C<$borrowernumber> contains the borrower number >- >-C<$date_due> contains the date of item return >- >- >-=cut >- >-sub CheckExistantNotifyid { >- my ( $borrowernumber, $date_due ) = @_; >- my $dbh = C4::Context->dbh; >- my $query = qq|SELECT notify_id FROM accountlines >- LEFT JOIN issues ON issues.itemnumber= accountlines.itemnumber >- WHERE accountlines.borrowernumber =? >- AND date_due = ?|; >- my $sth = $dbh->prepare($query); >- $sth->execute( $borrowernumber, $date_due ); >- return $sth->fetchrow || 0; >-} >- >-=head2 CheckAccountLineItemInfo >- >- ($exist) = &CheckAccountLineItemInfo($borrowernumber,$itemnumber,$accounttype,$notify_id); >- >-Check and Returns the list of all overdue items from the same file number(notify_id). >- >-C<$exist> contains number of line in accounlines >-with the same .biblionumber,itemnumber,accounttype,notify_id >- >-C<$borrowernumber> contains the borrower number >- >-C<$itemnumber> contains item number >- >-C<$accounttype> contains account type >- >-C<$notify_id> contains the file number >- >-=cut >- >-sub CheckAccountLineItemInfo { >- my ( $borrowernumber, $itemnumber, $accounttype, $notify_id ) = @_; >- my $dbh = C4::Context->dbh; >- my $query = qq|SELECT count(*) FROM accountlines >- WHERE borrowernumber =? >- AND itemnumber = ? >- AND accounttype= ? >- AND notify_id = ?|; >- my $sth = $dbh->prepare($query); >- $sth->execute( $borrowernumber, $itemnumber, $accounttype, $notify_id ); >- my ($exist) = $sth->fetchrow; >- return ($exist); >-} >- > =head2 CheckItemNotify > > Sql request to check if the document has alreday been notified >diff --git a/t/db_dependent/lib/KohaTest/Overdues.pm b/t/db_dependent/lib/KohaTest/Overdues.pm >index 07d9d41..5890d2b 100644 >--- a/t/db_dependent/lib/KohaTest/Overdues.pm >+++ b/t/db_dependent/lib/KohaTest/Overdues.pm >@@ -21,20 +21,11 @@ sub methods : Test( 1 ) { > GetIssuesIteminfo > UpdateFine > BorType >- ReplacementCost > GetFine >- ReplacementCost2 >- GetNextIdNotify > NumberNotifyId > AmountNotify >- UpdateAccountLines > GetItems >- GetOverdueDelays >- CheckAccountLineLevelInfo >- GetOverduerules > CheckBorrowerDebarred >- CheckExistantNotifyid >- CheckAccountLineItemInfo > CheckItemNotify > GetOverduesForBranch > AddNotifyLine >-- >1.7.2.5
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 10256
:
18165
|
18765
|
18978