X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reports%2Fcat_issues_top.pl;h=e5a4414e62c67d6ad25091433d25ccb92b1434ad;hb=3b23fb8b211c3fbedadc8b67bf294b65ed2ddf2d;hp=ed0b2c773f5549914ca024f88931bbe361abd611;hpb=5429c5f497fe426b6905b5ef9693f4e42afff5d7;p=koha.git diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl index ed0b2c773f..e5a4414e62 100755 --- a/reports/cat_issues_top.pl +++ b/reports/cat_issues_top.pl @@ -5,22 +5,23 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; +#use warnings; FIXME - Bug 2505 use C4::Auth; -use CGI; +use CGI qw ( -utf8 ); use C4::Context; use C4::Branch; # GetBranches use C4::Output; @@ -42,7 +43,7 @@ plugin that shows a stats on borrowers my $input = new CGI; my $do_it=$input->param('do_it'); -my $fullreportname = "reports/cat_issues_top.tmpl"; +my $fullreportname = "reports/cat_issues_top.tt"; my $limit = $input->param("Limit"); my $column = $input->param("Criteria"); my @filters = $input->param("Filter"); @@ -52,7 +53,6 @@ $filters[2]=format_date_in_iso($filters[2]); $filters[3]=format_date_in_iso($filters[3]); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); #warn "calcul : ".$calc; my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => $fullreportname, @@ -65,7 +65,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 @@ -75,7 +74,7 @@ if ($do_it) { $template->param(mainloop => $results, limit => $limit); 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', @@ -108,7 +107,7 @@ if ($do_it) { print $sep.$col->{totalcol}; } print $sep.@$results[0]->{total}; - exit(1); + exit; } # Displaying choices } else { @@ -118,18 +117,7 @@ if ($do_it) { my %select; my $req; - my @mime = ( C4::Context->preference("MIME") ); -# foreach my $mime (@mime){ -# warn "".$mime; -# } - - my $CGIextChoice=CGI::scrolling_list( - -name => 'MIME', - -id => 'MIME', - -values => \@mime, - -size => 1, - -multiple => 0 ); - + my $CGIextChoice = ( 'CSV' ); # FIXME translation my $CGIsepChoice=GetDelimiterChoices; #doctype @@ -271,7 +259,6 @@ sub calculate { } $strsth2 .=" group by $colfield"; $strsth2 .=" order by $colorder"; - warn "". $strsth2; my $sth2 = $dbh->prepare( $strsth2 ); if (( @colfilter ) and ($colfilter[1])){