[Koha-cvs] koha/reports issues_avg_stats.pl [rel_2_2]

[Henri-Damien LAURENT]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Henri-Damien LAURENT <hdl>	06/08/03 13:33:17

Modified files:
	reports        : issues_avg_stats.pl 

Log message:
	Simplifying some code.
	In order to ease the search for a bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_avg_stats.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.4&r2=1.2.2.5

Patches:
Index: issues_avg_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/issues_avg_stats.pl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -b -r1.2.2.4 -r1.2.2.5
--- issues_avg_stats.pl	5 Feb 2006 21:59:21 -0000	1.2.2.4
+++ issues_avg_stats.pl	3 Aug 2006 13:33:17 -0000	1.2.2.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: issues_avg_stats.pl,v 1.2.2.4 2006/02/05 21:59:21 kados Exp $
+# $Id: issues_avg_stats.pl,v 1.2.2.5 2006/08/03 13:33:17 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -528,12 +528,15 @@
 		my @result =split /:/,DateCalc($returndate,$issuedate) ;
 #  DateCalc returns => 0:0:WK:DD:HH:MM:SS   the weeks, days, hours, minutes,
 #  and seconds between the two
+#         warn " dateretour $returndate , date pret $issuedate";
+#         warn " retour de DateCalc :".DateCalc($returndate,$issuedate);
 		$loanlength = $result[2]*7+$result[3];
 #		warn "512 Same row and col DateCalc returns :$loanlength with return ". $returndate ."issue ". $issuedate ."weight : ". $weight;
 #		warn "513 row :".$row." column :".$col;
 		$table{$row}->{$col}+=$weight*$loanlength;
-#		$table{$row}->{totalrow}+=$weight*$loanlength;
-		$cnttable{$row}->{$col}= 1;
+# 		warn "".$table{$row}->{$col};
+		$table{$row}->{totalrow}+=$weight*$loanlength;
+# 		$cnttable{$row}->{$col}= 1;
 		$wgttable{$row}->{$col}+=$weight;
 	}
 	
@@ -545,12 +548,16 @@
 	# and the number matches the number of columns
 		my $colcount=0;
 		foreach my $col ( @loopcol ) {
-			my $value =$table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} / $wgttable{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} if ($table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}});
+            my $tmpcol = ((($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle});
+#             warn "row : $row col:$tmpcol  TABLE : ".$table{$row}->{$tmpcol}." POIDS : ".$wgttable{$row}->{$tmpcol};
+            my $value = $table{$row}->{$tmpcol} / $wgttable{$row}->{$tmpcol} if ($table{$row}->{$tmpcol});
 
-			$table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} = $value;
+			$table{$row}->{$tmpcol} = $value;
 			$table{$row}->{totalrow}+=$value;
-			#warn "row : $row col:$col  $cnttable{$row}->{(($col->{coltitle} eq \"NULL\")or ($col->{coltitle} eq \"\"))?\"zzEMPTY\":$col->{coltitle}}";
-			$colcount+=$cnttable{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}};
+			
+#             warn "row : $row col:$tmpcol  TABLE : ".$table{$row}->{$tmpcol}." POIDS : ".$wgttable{$row}->{$tmpcol};
+            
+			$colcount+=$cnttable{$row}->{$tmpcol};
 			push @loopcell, {value => ($value)?sprintf("%.2f",$value):0  } ;
 		}
 		#warn "row : $row colcount:$colcount";