From 6ec59c52b92a045b902e1bb6dbc1696b05e0946a Mon Sep 17 00:00:00 2001 From: toins Date: Thu, 12 Jul 2007 15:22:09 +0000 Subject: [PATCH] using 'our' instead of 'use vars' which is deprecated. removing some compilation warns. --- C4/Circulation.pm | 2 +- C4/Members.pm | 4 ++-- C4/Reserves.pm | 52 ++++++++++++++++++++++++++++++----------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 77760792c1..d46884cdce 100755 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -42,7 +42,7 @@ use POSIX qw(strftime); use C4::Branch; # GetBranches use C4::Log; # logaction -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); +our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,%EXPORT_TAGS); # set the version for version checking $VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); }; diff --git a/C4/Members.pm b/C4/Members.pm index 141ae86991..30f09a6bbc 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -29,7 +29,7 @@ use C4::Log; # logaction use C4::Overdues; use C4::Reserves; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); +our ($VERSION,@ISA,@EXPORT,@EXPORT_OK); $VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); }; @@ -1637,7 +1637,7 @@ sub DelMember { FROM borrowers WHERE borrowernumber = ? "; - my $sth = $dbh->prepare($query); + $sth = $dbh->prepare($query); $sth->execute($borrowernumber); $sth->finish; &logaction(C4::Context->userenv->{'number'},"MEMBERS","DELETE",$borrowernumber,"") diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 5d8e00da85..2393c42087 100755 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -29,7 +29,8 @@ use C4::Biblio; use C4::Search; use C4::Circulation; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); +our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,%EXPORT_TAGS); + my $library_name = C4::Context->preference("LibraryName"); # set the version for version checking @@ -45,7 +46,7 @@ C4::Reserves - Koha functions for dealing with reservation. =head1 DESCRIPTION -this modules provides somes functions to deal with reservations. + this modules provides somes functions to deal with reservations. =head1 FUNCTIONS @@ -61,12 +62,12 @@ this modules provides somes functions to deal with reservations. &GetReservesFromItemnumber &GetReservesFromBiblionumber &GetReservesFromBorrowernumber - GetReservesForBranch - GetReservesToBranch + &GetReservesForBranch + &GetReservesToBranch &GetReserveCount &GetReserveFee - GetReservesForBranch - GetReservesToBranch + &GetReservesForBranch + &GetReservesToBranch &GetOtherReserves &ModReserveFill @@ -83,7 +84,7 @@ this modules provides somes functions to deal with reservations. =item AddReserve -AddReserve($branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found) + AddReserve($branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found) =cut @@ -245,6 +246,14 @@ sub GetReservesFromBiblionumber { return ( $#results + 1, \@results ); } +=item GetReservesFromItemnumber + + ( $reservedate, $borrowernumber, $branchcode ) = GetReservesFromItemnumber($itemnumber); + + TODO :: Description here + +=cut + sub GetReservesFromItemnumber { my ( $itemnumber ) = @_; my $dbh = C4::Context->dbh; @@ -261,6 +270,13 @@ sub GetReservesFromItemnumber { return ( $reservedate, $borrowernumber, $branchcode ); } +=item GetReservesFromBorrowernumber + + $borrowerreserv = GetReservesFromBorrowernumber($borrowernumber,$tatus); + + TODO :: Descritpion +=cut + sub GetReservesFromBorrowernumber { my ( $borrowernumber, $status ) = @_; my $dbh = C4::Context->dbh; @@ -369,6 +385,14 @@ sub GetOtherReserves { return ( $messages, $nextreservinfo ); } +=item GetReserveFee + +$fee = GetReserveFee($borrowernumber,$biblionumber,$constraint,$biblionumber); + +Calculate the fee for a reserve + +=cut + sub GetReserveFee { my ($borrowernumber, $biblionumber, $constraint, $bibitems ) = @_; @@ -463,12 +487,10 @@ sub GetReserveFee { } } } - - # print "fee $fee"; return $fee; } -=head2 GetReservesToBranch +=item GetReservesToBranch @transreserv = GetReservesToBranch( $frombranch ); @@ -497,7 +519,7 @@ sub GetReservesToBranch { return (@transreserv); } -=head2 GetReservesForBranch +=item GetReservesForBranch @transreserv = GetReservesForBranch($frombranch); @@ -1088,14 +1110,6 @@ sub _Findgroupreserve { return @results; } -=item GetReserveFee - -$fee = GetReserveFee($borrowernumber,$biblionumber,$constraint,$biblionumber); - -Calculate the fee for a reserve - -=cut - =back =head1 AUTHOR -- 2.39.2