[Koha-cvs] CVS: koha moremember.pl,1.14,1.15

[Chris Cormack]

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

Modified Files:
        moremember.pl 
Log Message:
calc_charges expects to be passed a database handler, this wasnt happening, 
which was breaking this page


Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** moremember.pl       14 Aug 2002 18:12:51 -0000      1.14
--- moremember.pl       14 Sep 2002 01:20:12 -0000      1.15
***************
*** 38,41 ****
--- 38,44 ----
  use C4::Circulation::Circ2;
  use C4::Koha;
+ use C4::Database;
+ 
+ my $dbh=C4Connect;
  
  my $input = new CGI;
***************
*** 251,255 ****
    <TD>$issue->[$i]{'date_due'}</td>";
    #find the charge for an item
!   my 
($charge,$itemtype)=calc_charges(undef,$issue->[$i]{'itemnumber'},$bornum);
    print "<TD>$itemtype</td>";
    print "<TD>$charge</td>";
--- 254,258 ----
    <TD>$issue->[$i]{'date_due'}</td>";
    #find the charge for an item
!   my 
($charge,$itemtype)=calc_charges(undef,$dbh,$issue->[$i]{'itemnumber'},$bornum);
    print "<TD>$itemtype</td>";
    print "<TD>$charge</td>";
***************
*** 303,307 ****
  
  
! <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Charge</b></TD>
  
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Remove</b></TD>
--- 306,310 ----
  
  
! 
  
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Remove</b></TD>
***************
*** 319,330 ****
  #
  for (my $i=0;$i<$rescount;$i++){
!   $reserves->[$i]{'reservedate'} = 
slashifyDate($reserves->[$i]{'reservedate'});
! 
    print "<tr VALIGN=TOP  >
!   <TD><a 
href=\"/cgi-bin/koha/request.pl?bib=$reserves->[$i]{'biblionumber'}\">$reserves->[$i]{'btitle'}</a></td>
!   <TD>$reserves->[$i]{'reservedate'}</td>
    <input type=hidden name=biblio value=$reserves->[$i]{'biblionumber'}>
    <input type=hidden name=borrower value=$bornum>
!   <TD></td>
    <TD><select name=\"rank-request\">
    <option value=n>No
--- 322,336 ----
  #
  for (my $i=0;$i<$rescount;$i++){
!   $reserves->[$i]{'reservedate2'} = 
slashifyDate($reserves->[$i]{'reservedate'});
!   my $restitle;
!   if ($reserves->[$i]{'constrainttype'} eq 'o'){
!       
$restitle=getreservetitle($reserves->[$i]{'biblionumber'},$reserves->[$i]{'borrowernumber'},$reserves->[$i]{'reservedate'},$reserves->[$i]{'timestamp'});
!   } 
    print "<tr VALIGN=TOP  >
!   <TD><a 
href=\"/cgi-bin/koha/request.pl?bib=$reserves->[$i]{'biblionumber'}\">$reserves->[$i]{'btitle'}</a>
 $restitle->{'volumeddesc'} $restitle->{'itemtype'}</td>
!   <TD>$reserves->[$i]{'reservedate2'}</td>
    <input type=hidden name=biblio value=$reserves->[$i]{'biblionumber'}>
    <input type=hidden name=borrower value=$bornum>
! 
    <TD><select name=\"rank-request\">
    <option value=n>No
***************
*** 353,354 ****
--- 359,361 ----
  
  
+ $dbh->disconnect;