Bug 14365 - Populate never used saved_sql column last_run when execute_query is called

[koha.git] / reports / bor_issues_top.pl

diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index 6cd5467..cd2964b 100755 (executable)
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -23,13 +23,14 @@ use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 use C4::Context;
-use C4::Branch; # GetBranches
 use C4::Koha;
 use C4::Circulation;
 use C4::Members;
 use C4::Reports;
 use C4::Debug;
+
 use Koha::DateUtils;
+use Koha::Patron::Categories;
 
 =head1 NAME
 
@@ -37,8 +38,6 @@ plugin that shows a stats on borrowers
 
 =head1 DESCRIPTION
 
-=over 2
-
 =cut
 
 $debug = 1;
@@ -49,7 +48,7 @@ my $fullreportname = "reports/bor_issues_top.tt";
 my $do_it   = $input->param('do_it');
 my $limit   = $input->param("Limit");
 my $column  = $input->param("Criteria");
-my @filters = $input->param("Filter");
+my @filters = $input->multi_param("Filter");
 foreach ( @filters[0..3] ) {
     $_ and $_ = eval { output_pref( { dt => dt_from_string ( $_ ), dateonly => 1, dateformat => 'iso' }); };
 }
@@ -110,16 +109,6 @@ 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 $branches = GetBranches;
-my @branchloop;
-foreach (sort keys %$branches) {
-#      my $selected = 1 if $thisbranch eq $branch;
-       my %row = ( value => $_,
-#                              selected => $selected,
-                               branchname => $branches->{$_}->{branchname},
-                       );
-       push @branchloop, \%row;
-}
 
 my $itemtypes = GetItemTypes;
 my @itemtypeloop;
@@ -129,22 +118,14 @@ foreach (sort {$itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->
               );
     push @itemtypeloop, \%row;
 }
-    
-my ($codes,$labels) = GetborCatFromCatType(undef,undef);
-my @borcatloop;
-foreach (sort keys %$labels) {
-       my %row =(value => $_,
-              description => $labels->{$_},
-             );
-    push @borcatloop, \%row;
-}
-    
+
+my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
+
 $template->param(
            mimeloop => \@mime,
          CGIseplist => $delims,
-         branchloop => \@branchloop,
        itemtypeloop => \@itemtypeloop,
-         borcatloop => \@borcatloop,
+patron_categories => $patron_categories,
 );
 output_html_with_http_headers $input, $cookie, $template->output;
 
@@ -280,7 +261,7 @@ sub calculate {
     my $strcalc ;
 
 # Processing average loanperiods
-    $strcalc .= "SELECT  CONCAT(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)