Bug 24322: Simplify condition to separate elements

[koha-ffzg.git] / reports / issues_avg_stats.pl

diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index c013f05..d700664 100755 (executable)
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -18,8 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 use C4::Auth;
 use CGI qw ( -utf8 );
 use C4::Context;
@@ -61,14 +60,12 @@ my $rodsp = $input->param("ReturnDisplay");
 my $calc = $input->param("Cellvalue");
 my $output = $input->param("output");
 my $basename = $input->param("basename");
-my $itype = C4::Context->preference('item-level_itypes') ? "items.itype" : "biblioitems.itemtype";
 
 #warn "calcul : ".$calc;
 my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {reports => '*'},
                 debug => 1,
                     });
@@ -178,6 +175,7 @@ sub calculate {
     my @looprow;
     my %globalline;
     my $grantotal =0;
+    my $itype = C4::Context->preference('item-level_itypes') ? "items.itype" : "biblioitems.itemtype";
 # extract parameters
     my $dbh = C4::Context->dbh;
 
@@ -235,7 +233,7 @@ sub calculate {
     $linefilter[2] = @$filters[6] if ($line =~ /returndate/ )  ;
     $linefilter[3] = @$filters[7] if ($line =~ /returndate/ )  ;
     $linefilter[0] = @$filters[8] if ($line =~ /category/ )  ;
-    $linefilter[0] = @$filters[9] if ($line =~ /itemtype/ )  ;
+    $linefilter[0] = @$filters[9] if ($line eq $itype);
     $linefilter[0] = @$filters[10] if ($line =~ /branch/ )  ;
     $linefilter[0] = @$filters[11] if ($line =~ /sort1/ ) ;
     $linefilter[0] = @$filters[12] if ($line =~ /sort2/ ) ;
@@ -252,7 +250,7 @@ sub calculate {
     $colfilter[2] = @$filters[6] if ($column =~ /returndate/ )  ;
     $colfilter[3] = @$filters[7] if ($column =~ /returndate/ )  ;
     $colfilter[0] = @$filters[8] if ($column =~ /category/ )  ;
-    $colfilter[0] = @$filters[9] if ($column =~ $itype )  ;
+    $colfilter[0] = @$filters[9] if ($column eq $itype);
     $colfilter[0] = @$filters[10] if ($column =~ /branch/ )  ;
     $colfilter[0] = @$filters[11] if ($column =~ /sort1/ ) ;
     $colfilter[0] = @$filters[12] if ($column =~ /sort2/ ) ;
@@ -286,10 +284,6 @@ sub calculate {
                 LEFT JOIN borrowers ON borrowers.borrowernumber=old_issues.borrowernumber
                 LEFT JOIN items ON old_issues.itemnumber=items.itemnumber
                 LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber) 
-                LEFT JOIN issuingrules ON 
-                    (issuingrules.branchcode=old_issues.branchcode
-                    AND  issuingrules.itemtype=$itype
-                    AND  issuingrules.categorycode=borrowers.categorycode) 
                 WHERE 1";
     
     if (($line=~/timestamp/) or ($line=~/returndate/)){
@@ -356,10 +350,6 @@ sub calculate {
                   LEFT JOIN borrowers ON borrowers.borrowernumber=old_issues.borrowernumber
                   LEFT JOIN items  ON items.itemnumber=old_issues.itemnumber  
                   LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber) 
-                  LEFT JOIN issuingrules ON 
-                    (issuingrules.branchcode=old_issues.branchcode 
-                    AND  issuingrules.itemtype=$itype
-                    AND  issuingrules.categorycode=borrowers.categorycode) 
                   WHERE 1";
     
     if (($column=~/timestamp/) or ($column=~/returndate/)){
@@ -385,13 +375,7 @@ sub calculate {
     
     my $sth2 = $dbh->prepare( $strsth2 );
 
-    if (( @colfilter ) and ($colfilter[1])){
-        $sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
-    } elsif ($colfilter[0]) {
-        $sth2->execute;
-    } else {
-        $sth2->execute;
-    }
+    $sth2->execute;
 
     while (my ($celvalue) = $sth2->fetchrow) {
         my %cell;
@@ -404,7 +388,6 @@ sub calculate {
 #      warn "fin des titres colonnes";
 
     my $i=0;
-    my @totalcol;
     my $hilighted=-1;
     
     #Initialization of cell values.....
@@ -426,7 +409,7 @@ sub calculate {
     
 # Processing average loanperiods
     $strcalc .= "SELECT $linefield, $colfield, ";
-    $strcalc .= " issuedate, returndate, old_issues.timestamp, COUNT(*), date_due, old_issues.renewals, issuelength FROM `old_issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN issuingrules ON (issuingrules.branchcode=branchcode AND  issuingrules.itemtype=$itype AND  issuingrules.categorycode=categorycode) WHERE old_issues.itemnumber=items.itemnumber AND old_issues.borrowernumber=borrowers.borrowernumber";
+    $strcalc .= " issuedate, returndate, COUNT(*) FROM `old_issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) WHERE old_issues.itemnumber=items.itemnumber AND old_issues.borrowernumber=borrowers.borrowernumber";
 
     @$filters[0]=~ s/\*/%/g if (@$filters[0]);
     $strcalc .= " AND old_issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
@@ -457,12 +440,8 @@ sub calculate {
     $dbcalc->execute;
 #      warn "filling table";
     my $issues_count=0;
-    my $previous_row; 
-    my $previous_col;
     my $loanlength; 
-    my $err;
     my $emptycol;
-    my $weightrow;
 
     while (my  @data = $dbcalc->fetchrow) {
         my ($row, $col, $issuedate, $returndate, $weight)=@data;