[Koha-cvs] koha admin/issuingrules.pl C4/Circulation/Circ2.pm

Antoine Farnault antoine at koha-fr.org
Fri Jul 21 15:57:02 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Antoine Farnault <toins>	06/07/21 13:57:02

Modified files:
	admin          : issuingrules.pl 
	C4/Circulation : Circ2.pm 

Log message:
	subs renamed according to coding guidelines.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/issuingrules.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&r1=1.113&r2=1.114

Patches:
Index: admin/issuingrules.pl
===================================================================
RCS file: /sources/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- admin/issuingrules.pl	4 Jul 2006 14:36:51 -0000	1.8
+++ admin/issuingrules.pl	21 Jul 2006 13:57:02 -0000	1.9
@@ -100,7 +100,7 @@
 	}
 
 }
-my $branches = getbranches;
+my $branches = GetBranches;
 my @branchloop;
 foreach my $thisbranch (keys %$branches) {
 	my $selected = 1 if $thisbranch eq $branch;

Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- C4/Circulation/Circ2.pm	4 Jul 2006 14:57:26 -0000	1.113
+++ C4/Circulation/Circ2.pm	21 Jul 2006 13:57:02 -0000	1.114
@@ -3,7 +3,7 @@
 
 package C4::Circulation::Circ2;
 
-# $Id: Circ2.pm,v 1.113 2006/07/04 14:57:26 toins Exp $
+# $Id: Circ2.pm,v 1.114 2006/07/21 13:57:02 toins Exp $
 
 #package to deal with Returns
 #written 3/11/99 by olwen at katipo.co.nz
@@ -91,7 +91,7 @@
 		&getBranchIp
 		&dotranfer
         );
-# &getbranches &getprinters &getbranch &getprinter => moved to C4::Koha.pm
+# &GetBranches &getprinters &getbranch &getprinter => moved to C4::Koha.pm
 
 =head2 itemseen
 
@@ -483,7 +483,7 @@
 	my $messages;
 	my %env;
 	my $dotransfer = 1;
-	my $branches = getbranches();
+	my $branches = GetBranches();
 	my $iteminformation = getiteminformation(\%env, 0, $barcode);
 	# bad barcode..
 	if (not $iteminformation) {
@@ -886,14 +886,14 @@
 			# The item is on reserve and waiting, but has been
 			# reserved by some other patron.
 			my ($resborrower, $flags)=getpatroninformation($env, $resbor,0);
-			my $branches = getbranches();
+			my $branches = GetBranches();
 			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
 			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
 			# CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'}); Doesn't belong in a checking subroutine.
 		} elsif ($restype eq "Reserved") {
 			# The item is on reserve for someone else.
 			my ($resborrower, $flags)=getpatroninformation($env, $resbor,0);
-			my $branches = getbranches();
+			my $branches = GetBranches();
 			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
 			$needsconfirmation{RESERVED} = "$res->{'reservedate'} : $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'})";
 		}
@@ -971,7 +971,7 @@
 				# The item is on reserve and waiting, but has been
 				# reserved by some other patron.
 				my ($resborrower, $flags)=getpatroninformation($env, $resbor,0);
-				my $branches = getbranches();
+				my $branches = GetBranches();
 				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
                                 if ($cancelreserve){
     				    CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
@@ -983,7 +983,7 @@
 # 				warn "Reserved";
 				# The item is on reserve for someone else.
 				my ($resborrower, $flags)=getpatroninformation($env, $resbor,0);
-				my $branches = getbranches();
+				my $branches = GetBranches();
 				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
 				if ($cancelreserve) {
 					# cancel reserves on this item
@@ -1166,7 +1166,7 @@
 	}
 	# check if the book is in a permanent collection....
 	my $hbr = $iteminformation->{'homebranch'};
-	my $branches = getbranches();
+	my $branches = GetBranches();
 	if ($hbr && $branches->{$hbr}->{'PE'}) {
 		$messages->{'IsPermanent'} = $hbr;
 	}





More information about the Koha-cvs mailing list