Bug 9451: Quiet warnings and Plackify borrower_stats.pl

[koha.git] / reports / issues_avg_stats.pl

diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index f0f1dd5..bbd6f52 100755 (executable)
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -68,7 +68,6 @@ my ($template, $borrowernumber, $cookie)
 our $sep     = $input->param("sep");
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     );
 if ($do_it) {
 # Displaying results
@@ -77,7 +76,7 @@ if ($do_it) {
 # Printing results to screen
         $template->param(mainloop => $results);
         output_html_with_http_headers $input, $cookie, $template->output;
-        exit(1);
+        exit;
     } else {
 # Printing to a csv file
         print $input->header(-type => 'application/vnd.sun.xml.calc',
@@ -110,7 +109,7 @@ if ($do_it) {
             print $sep.$col->{totalcol};
         }
         print $sep.@$results[0]->{total};
-        exit(1);
+        exit;
     }
 # Displaying choices
 } else {
@@ -554,8 +553,23 @@ sub calculate {
     # 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 $value;
+            if ($table{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                }
+              ) {
+                $value = $table{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                  } / $wgttable{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                  };
+            }
             $table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} = $value;
             $table{$row}->{totalrow}+=$value;
             #warn "row : $row col:$col  $cnttable{$row}->{(($col->{coltitle} eq \"NULL\")or ($col->{coltitle} eq \"\"))?\"zzEMPTY\":$col->{coltitle}}";
@@ -563,12 +577,16 @@ sub calculate {
             push @loopcell, {value => ($value)?sprintf("%.2f",$value):0  } ;
         }
         #warn "row : $row colcount:$colcount";
-        my $total = $table{$row}->{totalrow}/$colcount if ($colcount>0);
-        push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
-                        'loopcell' => \@loopcell,
-                        'hilighted' => ($hilighted >0),
-                        'totalrow' => ($total)?sprintf("%.2f",$total):0
-                    };
+        my $total;
+        if ( $colcount > 0 ) {
+            $total = $table{$row}->{totalrow} / $colcount;
+        }
+        push @looprow,
+          { 'rowtitle' => ( $row eq "zzEMPTY" ) ? "NULL" : $row,
+            'loopcell' => \@loopcell,
+            'hilighted' => ( $hilighted > 0 ),
+            'totalrow'  => ($total) ? sprintf( "%.2f", $total ) : 0
+          };
         $hilighted = -$hilighted;
     }
 #