[Koha-cvs] CVS: koha/circ circulation.pl,1.84,1.85

[Paul POULAIN]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17631/circ

Modified Files:
	circulation.pl 
Log Message:
synch'ing 2.2 and head

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** circulation.pl	1 Mar 2005 13:40:50 -0000	1.84
--- circulation.pl	4 May 2005 08:52:12 -0000	1.85
***************
*** 87,91 ****
  my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
  
- # my $message;
  
  # check and see if we should print
--- 87,90 ----
***************
*** 104,107 ****
--- 103,107 ----
  #
  my $borrowerslist;
+ my $message;
  if ($findborrower) {
  	my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'cardnumber','web');
***************
*** 109,112 ****
--- 109,113 ----
  	if ($#borrowers == -1) {
  		$query->param('findborrower', '');
+ 		$message =  "'$findborrower'";
  	} elsif ($#borrowers == 0) {
  		$query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
***************
*** 220,224 ****
  		push @realtodayissues,$book;
  	}
!     
  	# parses previous & build Template array
      foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
--- 221,225 ----
  		push @realtodayissues,$book;
  	}
! 
  	# parses previous & build Template array
      foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
***************
*** 257,261 ****
  	foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
  		push @values,$_->{'borrowernumber'};
! 		$labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ($_->{'cardnumber'})";
  	}
  	$CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
--- 258,262 ----
  	foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
  		push @values,$_->{'borrowernumber'};
! 		$labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ...  $_->{'streetaddress'} ";
  	}
  	$CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
***************
*** 291,294 ****
--- 292,296 ----
  		barcode => $barcode,
  		stickyduedate => $stickyduedate,
+ 		message => $message,
  		CGIselectborrower => $CGIselectborrower,
  		todayissues => \@realtodayissues,