[Koha-cvs] CVS: koha/circ circulation.pl,1.81.2.3,1.81.2.4

[Owen Leonard]

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

Modified Files:
      Tag: rel_2_2
	circulation.pl 
Log Message:
Putting message variable back into the script to handle cases where a patron search from the circulation prompt returns zero results.  This was removed in a previous update.

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.3
retrieving revision 1.81.2.4
diff -C2 -r1.81.2.3 -r1.81.2.4
*** circulation.pl	28 Feb 2005 17:06:49 -0000	1.81.2.3
--- circulation.pl	31 Mar 2005 16:42:43 -0000	1.81.2.4
***************
*** 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,