From e42c4306a2167d52399ba97f12d13ef12b6b02ed Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 30 Mar 2007 13:30:36 +0000 Subject: [PATCH] oups, fixing bug in EXPORT... --- C4/Circulation/Circ2.pm | 62 +++++++++++++++++++++++++++++------------ C4/Circulation/Fines.pm | 41 +++++++++++++++++++-------- C4/Reserves2.pm | 1 - 3 files changed, 74 insertions(+), 30 deletions(-) diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm index 32ac018625..0f13d2dcb6 100755 --- a/C4/Circulation/Circ2.pm +++ b/C4/Circulation/Circ2.pm @@ -62,39 +62,65 @@ Also deals with stocktaking. =cut @ISA = qw(Exporter); -@EXPORT = qw( + +# FIXME subs that should probably be elsewhere +push @EXPORT, qw( &getpatroninformation + &getiteminformation +); +# subs to deal with issuing a book +push @EXPORT, qw( + &canbookbeissued + &issuebook ¤tissues &getissues - &getiteminformation &renewstatus &renewbook - &canbookbeissued - &issuebook + &calc_charges + &fixdate + &GetIssuesFromBiblio + &itemissues + &AnonymiseIssueHistory +); +# subs to deal with returns +push @EXPORT, qw( &returnbook +); +# subs to deal with reserves => Move to Reserves2.pm +push @EXPORT, qw( &find_reserves + &GetReservesForBranch + &GetReservesToBranch +); + +# subs to deal with transfers +push @EXPORT, qw( &transferbook - &decode - &calc_charges - &GetItemsForInventory - &itemseen - &fixdate - &get_current_return_date_of &get_transfert_infos &checktransferts - &GetReservesForBranch - &GetReservesToBranch &GetTransfersFromBib - &getBranchIp + &updateWrongTransfer +); + +# subs to remove +push @EXPORT, qw( + &decode + &get_current_return_date_of &dotransfer +); + +# to move in Biblio.pm +push @EXPORT, qw( + &itemseen + &GetItemsForInventory + &GetLostItems +); + +# subs to deal with late issues => to move to Fines.pm +push @EXPORT, qw( &GetOverduesForBranch &AddNotifyLine &RemoveNotifyLine - &GetIssuesFromBiblio - &AnonymiseIssueHistory - &GetLostItems - &itemissues - &updateWrongTransfer ); =head2 itemseen diff --git a/C4/Circulation/Fines.pm b/C4/Circulation/Fines.pm index 373686ea9a..cddecc912e 100644 --- a/C4/Circulation/Fines.pm +++ b/C4/Circulation/Fines.pm @@ -52,30 +52,49 @@ overdue items. It is primarily used by the 'misc/fines2.pl' script. =cut @ISA = qw(Exporter); -@EXPORT = qw( &BorType +# subs to rename (and maybe merge some...) +push @EXPORT, qw( &CalcFine &Getoverdues - &GetIssuingRules &CheckAccountLineLevelInfo &CheckAccountLineItemInfo &CheckExistantNotifyid - &CheckBorrowerDebarred - &GetIssuesIteminfo &GetNextIdNotify - &GetOverdueDelays - &GetOverduerules - &GetFine - &GetItems &GetNotifyId - &GetNextIdNotify &NumberNotifyId &AmountNotify &UpdateAccountLines &UpdateFine - &UpdateBorrowerDebarred + &GetOverdueDelays + &GetOverduerules + &GetFine &CreateItemAccountLine + &ReplacementCost2 +); +# subs to remove +push @EXPORT, qw( + &BorType +); + +# +# All subs to move : check that an equivalent don't exist already before moving +# + +# subs to move to Circulation.pm +push @EXPORT, qw( + &GetIssuingRules + &GetIssuesIteminfo +); +# subs to move to Members.pm +push @EXPORT, qw( + &CheckBorrowerDebarred + &UpdateBorrowerDebarred +); +# subs to move to Biblio.pm +push @EXPORT, qw( + &GetItems &ReplacementCost - &ReplacementCost2); +); =item Getoverdues diff --git a/C4/Reserves2.pm b/C4/Reserves2.pm index 5db1226fe2..8d00a98847 100755 --- a/C4/Reserves2.pm +++ b/C4/Reserves2.pm @@ -55,7 +55,6 @@ this modules provides somes functions to deal with reservations. @ISA = qw(Exporter); -# FIXME Take out CalcReserveFee after it can be removed from opac-reserves.pl @EXPORT = qw( &FindReserves &CheckReserves -- 2.39.5