[Koha-cvs] CVS: koha/circ circulation.pl,1.46,1.47 returns.pl,1.25,1.26

[Ambrose Li]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1:/tmp/cvs-serv14239/circ

Modified Files:
	circulation.pl returns.pl 
Log Message:
Implemented fixes for bug 170
1. Circ2::returnbook will throw an exception if $branch is undef
2. branch/printer-getting code is modularized into getbranch and getprinter
   with correct logic from circulation.pl (temporarily put into Circ2.pm)
3. circulation.pl and returns.pl modified to use above functions

Noted correct tab sizes for the files; returns.pl partially reformatted to
conform to the dominant correct tab size

Handle non-latin1 charsets for returns.pl


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** circulation.pl	24 Oct 2002 18:30:18 -0000	1.46
--- circulation.pl	5 Feb 2003 06:28:58 -0000	1.47
***************
*** 1,3 ****
--- 1,4 ----
  #!/usr/bin/perl
+ # Please use 8-character tabs for this file (indents are every 4 characters)
  
  #written 8/5/2002 by Finlay
***************
*** 48,60 ****
  my $query = new CGI;
  
! my $branch = $query->param("branch");
! my $printer = $query->param("printer");
! 
! ($branch) || ($branch=$query->cookie('branch')) ;
! ($printer) || ($printer=$query->cookie('printer')) ;
! 
! ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
! ($printers->{$printer}) || ($printer=(keys %$printers)[0]);
! 
  
  
--- 49,54 ----
  my $query = new CGI;
  
! my $branch = getbranch($query, $branches);
! my $printer = getprinter($query, $printers);
  
  
***************
*** 690,691 ****
--- 684,689 ----
      remoteprint($env,\@issues,$borrower);
  }
+ 
+ # Local Variables:
+ # tab-width: 8
+ # End:

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** returns.pl	29 Jan 2003 22:45:07 -0000	1.25
--- returns.pl	5 Feb 2003 06:28:58 -0000	1.26
***************
*** 1,3 ****
--- 1,4 ----
  #!/usr/bin/perl
+ # Please use 8-character tabs for this file (indents are 4 spaces)
  
  #written 11/3/2002 by Finlay
***************
*** 30,33 ****
--- 31,35 ----
  use C4::Reserves2;
  use C4::Auth;
+ use C4::Interface::CGI::Output;
  use HTML::Template;
  
***************
*** 56,67 ****
  my $printers = getprinters(\%env);
  
! my $branch = $query->param("branch");
! my $printer = $query->param("printer");
! 
! ($branch) || ($branch=$query->cookie('branch')) ;
! ($printer) || ($printer=$query->cookie('printer')) ;
! 
! my $genbrname=$branches->{$branch}->{'branchname'};
! my $genprname=$printers->{$printer}->{'printer'};
  
  #
--- 58,63 ----
  my $printers = getprinters(\%env);
  
! my $branch = getbranch($query, $branches);
! my $printer = getprinter($query, $printers);
  
  #
***************
*** 365,379 ****
  $template->param(riloop => \@riloop);
  
! $template->param(	genbrname => $genbrname,
! 								genprname => $genprname,
! 								branch => $branch,
! 								printer => $printer,
! 								hdrbckgdcolor => $headerbackgroundcolor,
! 								bckgdimg => $backgroundimage,
! 								errmsgloop => \@errmsgloop
! 							);
  
  # actually print the page!
! print $query->header(), $template->output;
  
  sub cuecatbarcodedecode {
--- 361,375 ----
  $template->param(riloop => \@riloop);
  
! $template->param(	genbrname => $branches->{$branch}->{'branchname'},
! 			genprname => $printers->{$printer}->{'printername'},
! 			branch => $branch,
! 			printer => $printer,
! 			hdrbckgdcolor => $headerbackgroundcolor,
! 			bckgdimg => $backgroundimage,
! 			errmsgloop => \@errmsgloop
! 		);
  
  # actually print the page!
! output_html_with_http_headers $query, $cookie, $template->output;
  
  sub cuecatbarcodedecode {
***************
*** 387,388 ****
--- 383,388 ----
  	return $barcode;
      }}
+ 
+ # Local Variables:
+ # tab-width: 8
+ # End: