[Koha-cvs] koha/C4 Circulation/Circ2.pm Circulation/Fines....

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/03/30 13:30:39

Modified files:
        C4/Circulation : Circ2.pm Fines.pm 
        C4             : Reserves2.pm 

Log message:
        oups, fixing bug in EXPORT...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Fines.pm?cvsroot=koha&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&r1=1.50&r2=1.51

Patches:
Index: Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- Circulation/Circ2.pm        30 Mar 2007 08:38:44 -0000      1.128
+++ Circulation/Circ2.pm        30 Mar 2007 13:30:36 -0000      1.129
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Circ2.pm,v 1.128 2007/03/30 08:38:44 btoumi Exp $
+# $Id: Circ2.pm,v 1.129 2007/03/30 13:30:36 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -41,7 +41,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.128 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.129 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -62,39 +62,65 @@
 =cut
 
 @ISA    = qw(Exporter);
address@hidden = 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
   &currentissues
   &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

Index: Circulation/Fines.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Circulation/Fines.pm        9 Mar 2007 23:30:17 -0000       1.22
+++ Circulation/Fines.pm        30 Mar 2007 13:30:36 -0000      1.23
@@ -1,6 +1,6 @@
 package C4::Circulation::Fines;
 
-# $Id: Fines.pm,v 1.22 2007/03/09 23:30:17 kados Exp $
+# $Id: Fines.pm,v 1.23 2007/03/30 13:30:36 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -29,7 +29,7 @@
 use C4::Log; # logaction
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.22 $' =~ /\d+/g; 
+$VERSION = do { my @v = '$Revision: 1.23 $' =~ /\d+/g; 
 shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -52,30 +52,49 @@
 =cut
 
 @ISA    = qw(Exporter);
address@hidden = 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
 

Index: Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- Reserves2.pm        9 Mar 2007 14:31:47 -0000       1.50
+++ Reserves2.pm        30 Mar 2007 13:30:38 -0000      1.51
@@ -20,7 +20,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Reserves2.pm,v 1.50 2007/03/09 14:31:47 tipaul Exp $
+# $Id: Reserves2.pm,v 1.51 2007/03/30 13:30:38 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -33,7 +33,7 @@
 my $library_name = C4::Context->preference("LibraryName");
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.50 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.51 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -55,7 +55,6 @@
 
 @ISA = qw(Exporter);
 
-# FIXME Take out CalcReserveFee after it can be removed from opac-reserves.pl
 @EXPORT = qw(
   &FindReserves
   &CheckReserves