Bug 30253: Remove a double mana_success parameter

[srvgit] / reports / bor_issues_top.pl

diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index d4d4dbe..912798e 100755 (executable)
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -17,19 +17,15 @@
 # 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 CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Context;
-use C4::Koha;
-use C4::Circulation;
-use C4::Members;
-use C4::Reports;
-use C4::Debug;
+use C4::Reports qw( GetDelimiterChoices );
 
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::ItemTypes;
 use Koha::Patron::Categories;
 
@@ -41,10 +37,7 @@ plugin that shows a stats on borrowers
 
 =cut
 
-$debug = 1;
-$debug and open DEBUG, ">/tmp/bor_issues_top.debug.log";
-
-my $input = new CGI;
+my $input = CGI->new;
 my $fullreportname = "reports/bor_issues_top.tt";
 my $do_it   = $input->param('do_it');
 my $limit   = $input->param("Limit");
@@ -59,11 +52,9 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {reports => '*'},
-                debug => 1,
                 });
-our $sep     = $input->param("sep");
+our $sep     = $input->param("sep") || C4::Context->preference('CSVDelimiter') || ',';
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
         );
@@ -105,13 +96,12 @@ if ($do_it) {
 }
 
 my $dbh = C4::Context->dbh;
-my @values;
 
 # here each element returned by map is a hashref, get it?
 my @mime  = ( map { {type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation
 my $delims = GetDelimiterChoices;
 
-my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
+my $patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['categorycode']});
 my $itemtypes = Koha::ItemTypes->search_with_localization;
 $template->param(
            mimeloop => \@mime,
@@ -126,7 +116,6 @@ sub calculate {
     my ($limit, $column, $filters) = @_;
 
     my @loopcol;
-    my @loopline;
     my @looprow;
     my %globalline;
        my %columns;
@@ -227,25 +216,20 @@ sub calculate {
         $strsth2 .=" GROUP BY $colfield";
         $strsth2 .=" ORDER BY $colorder";
 
-        $debug and print DEBUG "bor_issues_top (old_issues) SQL: $strsth2\n";
         my $sth2 = $dbh->prepare($strsth2);
         $sth2->execute;
-        print DEBUG "rows: ", $sth2->rows, "\n";
         while (my @row = $sth2->fetchrow) {
                        $columns{($row[0] ||'NULL')}++;
             push @loopcol, { coltitle => $row[0] || 'NULL' };
         }
 
                $strsth2 =~ s/old_issues/issues/g;
-        $debug and print DEBUG "bor_issues_top (issues) SQL: $strsth2\n";
                $sth2 = $dbh->prepare($strsth2);
         $sth2->execute;
-        $debug and print DEBUG "rows: ", $sth2->rows, "\n";
         while (my @row = $sth2->fetchrow) {
                        $columns{($row[0] ||'NULL')}++;
             push @loopcol, { coltitle => $row[0] || 'NULL' };
         }
-               $debug and print DEBUG "full array: ", Dumper(\%columns), "\n";
     }else{
         $columns{''} = 1;
     }
@@ -253,7 +237,7 @@ sub calculate {
     my $strcalc ;
 
 # Processing average loanperiods
-    $strcalc .= "SELECT  CONCAT_WS('', borrowers.surname , \",\\t\", borrowers.firstname),  COUNT(*) AS RANK, borrowers.borrowernumber AS ID";
+    $strcalc .= "SELECT  CONCAT_WS('', borrowers.surname , \",\\t\", borrowers.firstname),  COUNT(*) AS `RANK`, borrowers.borrowernumber AS ID";
     $strcalc .= " , $colfield " if ($colfield);
     $strcalc .= " FROM `old_issues`
                   LEFT JOIN  borrowers  USING(borrowernumber)
@@ -278,14 +262,12 @@ sub calculate {
        }
     $strcalc .= " GROUP BY borrowers.borrowernumber";
     $strcalc .= ", $colfield" if ($column);
-    $strcalc .= " ORDER BY RANK DESC";
+    $strcalc .= " ORDER BY `RANK` DESC";
     $strcalc .= ",$colfield " if ($colfield);
     $strcalc .= " LIMIT $limit" if ($limit);
 
-    $debug and print DEBUG "(old_issues) SQL : $strcalc\n";
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
-    $debug and print DEBUG "rows: ", $dbcalc->rows, "\n";
        my %patrons = ();
        # DATA STRUCTURE is going to look like this:
        #       (2253=> {name=>"John Doe",
@@ -301,13 +283,10 @@ sub calculate {
                $patrons{$id}->{oldcols}->{$col} = $rank;
     }
 
-       use Data::Dumper;
-
+       
        $strcalc =~ s/old_issues/issues/g;
-    $debug and print DEBUG "(issues) SQL : $strcalc\n";
     $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
-    $debug and print DEBUG "rows: ", $dbcalc->rows, "\n";
     while (my @data = $dbcalc->fetchrow) {
         my ($row, $rank, $id, $col) = @data;
         $col = "zzEMPTY" if (!defined($col));
@@ -326,7 +305,6 @@ sub calculate {
                        $patrons{$id}->{total} += $count;
                }
        }
-    $debug and print DEBUG "\n\npatrons: ", Dumper(\%patrons);
     
        my $i = 1;
        my @cols_in_order = sort keys %columns;         # if you want to order the columns, do something here
@@ -372,6 +350,5 @@ sub calculate {
     return [\%globalline];     # reference to a 1 element array: that element is a hashref
 }
 
-$debug and close DEBUG;
 1;
 __END__