[Koha-cvs] CVS: koha/reports borrowers_out.pl,1.2,1.3

[Paul POULAIN]

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

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

Index: borrowers_out.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** borrowers_out.pl	4 May 2005 09:02:38 -0000	1.2
--- borrowers_out.pl	20 Jun 2005 14:34:45 -0000	1.3
***************
*** 160,164 ****
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=6;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
--- 160,164 ----
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=2;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
***************
*** 168,171 ****
--- 168,172 ----
  			$cell{filter} .= @$filters[$i];
  			$cell{crit} .="Bor Cat" if ($i==0);
+ 			$cell{crit} .="Without issues since" if ($i==1);
  			push @loopfilter, \%cell;
  		}
***************
*** 229,239 ****
  	my $strcalc ;
  	
! # Processing average loanperiods
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers LEFT JOIN issues ON  issues.borrowernumber=borrowers.borrowernumber WHERE issues.borrowernumber is null";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);
--- 230,253 ----
  	my $strcalc ;
  	
! # Processing calculation
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers ";
! 	$strcalc .= "WHERE 1 ";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	if (@$filters[1]){
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp>?");
! 		$queryfilter->execute(@$filters[1]);
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	} else {
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
! 		$queryfilter->execute;
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	}
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);