[Koha-cvs] CVS: koha/circ circulation.pl,1.58,1.59

[Chris Cormack]

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

Modified Files:
	circulation.pl 
Log Message:
Fixing the internal server error bug



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** circulation.pl	7 Jul 2003 14:46:55 -0000	1.58
--- circulation.pl	10 Jul 2003 09:39:12 -0000	1.59
***************
*** 234,241 ****
  		push @realtodayissues,$book;
  	}
! 	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	$book->{'dd'}=$dd;
! 	$book->{'tcolor'}=$tcolor;
! 	push @realtodayissues,$book
  }
      # FIXME - For small and private libraries, it'd be nice if this
--- 234,238 ----
  		push @realtodayissues,$book;
  	}
! 
  }
      # FIXME - For small and private libraries, it'd be nice if this
***************
*** 251,260 ****
  	my $datedue = $book->{'date_due'};
  	$dd=format_date($dd);
  	$datedue=~s/-//g;
  	if ($datedue < $todaysdate) {
  	    $dd="<font color=red>$dd</font>\n";
  	}
  }
- 
  # actually print the page!
  #if ($branchcookie && $printercookie) {
--- 248,262 ----
  	my $datedue = $book->{'date_due'};
  	$dd=format_date($dd);
+ 	my $pcolor = '';
  	$datedue=~s/-//g;
  	if ($datedue < $todaysdate) {
  	    $dd="<font color=red>$dd</font>\n";
  	}
+ 	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); 
+ 	$book->{'dd'}=$dd; 
+ 	$book->{'tcolor'}=$pcolor; 
+ 	push @realprevissues,$book
+    }
  }
  # actually print the page!
  #if ($branchcookie && $printercookie) {
***************
*** 323,326 ****
--- 325,330 ----
  		CHARGES => $flags->{'CHARGES'},
  		amountold => $amountold,
+ 		todayissues => \@realtodayissues, 
+ 		previssues => \@realprevissues
  	);