(bug #3655) fix news language detection

[koha.git] / reports / cat_issues_top.pl

diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index c11c899..12c8884 100755 (executable)
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -26,6 +26,7 @@ use C4::Branch; # GetBranches
 use C4::Output;
 use C4::Koha;
 use C4::Circulation;
+use C4::Reports;
 use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Members;
 
@@ -50,7 +51,6 @@ $filters[1]=format_date_in_iso($filters[1]);
 my $output = $input->param("output");
 my $basename = $input->param("basename");
 my $mime = $input->param("MIME");
-my $del = $input->param("sep");
 #warn "calcul : ".$calc;
 my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
@@ -60,6 +60,8 @@ my ($template, $borrowernumber, $cookie)
                 flagsrequired => { reports => 1},
                 debug => 1,
                 });
+our $sep     = $input->param("sep");
+$sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
         DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         );
@@ -80,8 +82,6 @@ if ($do_it) {
                             -filename=>"$basename.csv" );
         my $cols = @$results[0]->{loopcol};
         my $lines = @$results[0]->{looprow};
-        my $sep;
-        $sep =C4::Context->preference("delimiter");
 # header top-right
         print @$results[0]->{line} ."/". @$results[0]->{column} .$sep;
 # Other header
@@ -128,33 +128,14 @@ if ($do_it) {
                 -size     => 1,
                 -multiple => 0 );
     
-    my @dels = ( C4::Context->preference("delimiter") );
-    my $CGIsepChoice=CGI::scrolling_list(
-                -name     => 'sep',
-                -id       => 'sep',
-                -values   => \@dels,
-                -size     => 1,
-                -multiple => 0 );
-    #branch
-    my $branches = GetBranches;
-    my @branchloop;
-    foreach my $thisbranch (keys %$branches) {
-#                      my $selected = 1 if $thisbranch eq $branch;
-            my %row =(value => $thisbranch,
-#                                                                      selected => $selected,
-                                    branchname => $branches->{$thisbranch}->{'branchname'},
-                            );
-            push @branchloop, \%row;
-    }
+    my $CGIsepChoice=GetDelimiterChoices;
 
     #doctype
     my $itemtypes = GetItemTypes;
     my @itemtypeloop;
-    foreach my $thisitemtype (keys %$itemtypes) {
-#                      my $selected = 1 if $thisbranch eq $branch;
+    foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) {
             my %row =(value => $thisitemtype,
-#                                                                      selected => $selected,
-                                    description => $itemtypes->{$thisitemtype}->{'description'},
+                      description => $itemtypes->{$thisitemtype}->{'description'},
                             );
             push @itemtypeloop, \%row;
     }
@@ -162,11 +143,9 @@ if ($do_it) {
     #borcat
     my ($codes,$labels) = GetborCatFromCatType(undef,undef);
     my @borcatloop;
-    foreach my $thisborcat (sort keys %$labels) {
-#                      my $selected = 1 if $thisbranch eq $branch;
+    foreach my $thisborcat (sort {$labels->{$a} cmp $labels->{$b}} keys %$labels) {
             my %row =(value => $thisborcat,
-#                                                                      selected => $selected,
-                                    description => $labels->{$thisborcat},
+                      description => $labels->{$thisborcat},
                             );
             push @borcatloop, \%row;
     }
@@ -176,7 +155,7 @@ if ($do_it) {
     $template->param(
                     CGIextChoice => $CGIextChoice,
                     CGIsepChoice => $CGIsepChoice,
-                    branchloop =>\@branchloop,
+                    branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
                     itemtypeloop =>\@itemtypeloop,
                     borcatloop =>\@borcatloop,
                     );