[Koha-cvs] CVS: koha/circ circulation.pl,1.44,1.45

Andrew Arensburger arensb at users.sourceforge.net
Sun Oct 13 12:43:56 CEST 2002


Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv24031

Modified Files:
	circulation.pl 
Log Message:
Removed trailing whitespace.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** circulation.pl	9 Oct 2002 14:29:39 -0000	1.44
--- circulation.pl	13 Oct 2002 10:43:54 -0000	1.45
***************
*** 87,92 ****
  }
  
! my $borrowernumber = $query->param('borrnumber');    
! my $bornum = $query->param('borrnumber');    
  # check and see if we should print
  my $print=$query->param('print');
--- 87,92 ----
  }
  
! my $borrowernumber = $query->param('borrnumber');
! my $bornum = $query->param('borrnumber');
  # check and see if we should print
  my $print=$query->param('print');
***************
*** 96,104 ****
  }
  if ($print eq 'yes' && $borrowernumber ne ''){
!     printslip(\%env,$borrowernumber);    
      $query->param('borrnumber','');
      $borrowernumber='';
  }
!     
  
  
--- 96,104 ----
  }
  if ($print eq 'yes' && $borrowernumber ne ''){
!     printslip(\%env,$borrowernumber);
      $query->param('borrnumber','');
      $borrowernumber='';
  }
! 
  
  
***************
*** 138,142 ****
  	my @time=localtime(time);
  	my $date= (1900+$time[5])."-".($time[4]+1)."-".$time[3];
! 	($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer, $message) 
                       = issuebook(\%env, $borrower, $barcode, \%responses, $date);
      }
--- 138,142 ----
  	my @time=localtime(time);
  	my $date= (1900+$time[5])."-".($time[4]+1)."-".$time[3];
! 	($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer, $message)
                       = issuebook(\%env, $borrower, $barcode, \%responses, $date);
      }
***************
*** 201,205 ****
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
! <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
  <b>Printer:</b> $printers->{$printer}->{'printername'} <br>
  <a href=selectbranchprinter.pl>Change Settings</a></td>
--- 201,205 ----
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
! <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp
  <b>Printer:</b> $printers->{$printer}->{'printername'} <br>
  <a href=selectbranchprinter.pl>Change Settings</a></td>
***************
*** 216,220 ****
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
! <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
  <b>Printer:</b> $printers->{$printer}->{'printername'} <br>
  <a href=selectbranchprinter.pl>Change Settings</a></td>
--- 216,220 ----
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
! <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp
  <b>Printer:</b> $printers->{$printer}->{'printername'} <br>
  <a href=selectbranchprinter.pl>Change Settings</a></td>
***************
*** 249,254 ****
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
  <font size=+2 color=red><b>Issuing Question</b></font></th></tr>
! <tr><td><table border=0 cellpadding=10><tr><td> 
! Attempting to issue $iteminformation->{'title'} 
  by $iteminformation->{'author'} to $borrower->{'firstname'} $borrower->{'surname'}.
  <p>
--- 249,254 ----
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
  <font size=+2 color=red><b>Issuing Question</b></font></th></tr>
! <tr><td><table border=0 cellpadding=10><tr><td>
! Attempting to issue $iteminformation->{'title'}
  by $iteminformation->{'author'} to $borrower->{'firstname'} $borrower->{'surname'}.
  <p>
***************
*** 407,411 ****
  	my $datedue = $book->{'date_due'};
  	#convert to nz style dates
! 	#this should be set with some kinda config variable	    
  	my @tempdate=split(/-/,$dd);
  	$dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
--- 407,411 ----
  	my $datedue = $book->{'date_due'};
  	#convert to nz style dates
! 	#this should be set with some kinda config variable
  	my @tempdate=split(/-/,$dd);
  	$dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
***************
*** 423,427 ****
  <td bgcolor=$tcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
  EOF
!     } 
      # FIXME - For small and private libraries, it'd be nice if this
      # table included a "Return" link next to each book, so that you
--- 423,427 ----
  <td bgcolor=$tcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
  EOF
!     }
      # FIXME - For small and private libraries, it'd be nice if this
      # table included a "Return" link next to each book, so that you
***************
*** 432,436 ****
  	my $datedue = $book->{'date_due'};
  	#convert to nz style dates
! 	#this should be set with some kinda config variable	    
  	my @tempdate=split(/-/,$dd);
  	$dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
--- 432,436 ----
  	my $datedue = $book->{'date_due'};
  	#convert to nz style dates
! 	#this should be set with some kinda config variable
  	my @tempdate=split(/-/,$dd);
  	$dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
***************
*** 554,559 ****
      } else {
  	return $barcode;
!     } 
! } 
  
  sub fixdate {
--- 554,559 ----
      } else {
  	return $barcode;
!     }
! }
  
  sub fixdate {
***************
*** 619,623 ****
  			my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
  			$itemswaiting.="<tr><td><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td>$iteminformation->{'title'}</td></tr>\n";
! 		    }		    
  		}
  		$itemswaiting.="</table>\n";
--- 619,623 ----
  			my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
  			$itemswaiting.="<tr><td><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td>$iteminformation->{'title'}</td></tr>\n";
! 		    }
  		}
  		$itemswaiting.="</table>\n";
***************
*** 625,629 ****
    		  $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}, See below</td></tr>\n";
  		} else {
!   		  $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n"; 
  		}
  	    } else {
--- 625,629 ----
    		  $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}, See below</td></tr>\n";
  		} else {
!   		  $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n";
  		}
  	    } else {





More information about the Koha-cvs mailing list