suggestions changes (probably useless)

[koha_fer] / opac / opac-topissues.pl

diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index c0c26c8..1b0d42a 100755 (executable)
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,14 +19,15 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-use C4::Auth;
+use warnings;
+
 use CGI;
+use C4::Auth;
 use C4::Context;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
 use C4::Branch;
-use C4::Interface::CGI::Output;
 use Date::Manip;
 
 =head1 NAME
@@ -36,8 +36,7 @@ plugin that shows a stats on borrowers
 
 =head1 DESCRIPTION
 
-
-=over2
+=over 2
 
 =cut
 
@@ -55,16 +54,17 @@ my ($template, $borrowernumber, $cookie)
 my $dbh = C4::Context->dbh;
 # Displaying results
 my $limit = $input->param('limit') || 10;
-my $branch = $input->param('branch');
-my $itemtype = $input->param('itemtype');
+my $branch = $input->param('branch') || '';
+my $itemtype = $input->param('itemtype') || '';
 my $timeLimit = $input->param('timeLimit') || 3;
-my $whereclause;
-$whereclause .= 'items.homebranch='.$dbh->quote($branch)." AND " if ($branch); 
+my $whereclause = '';
+$whereclause .= 'items.homebranch='.$dbh->quote($branch)." AND " if ($branch);
 $whereclause .= 'biblioitems.itemtype='.$dbh->quote($itemtype)." AND " if $itemtype;
-$whereclause .= 'TO_DAYS(NOW()) - TO_DAYS(biblio.timestamp) <= '.$timeLimit*30 if $timeLimit;
-$whereclause =~ s/ AND $//;
+$whereclause .= ' TO_DAYS(NOW()) - TO_DAYS(biblio.datecreated) <= '.($timeLimit*30).' AND ' if $timeLimit < 999;
+$whereclause =~ s/ AND $// if $whereclause;
 $whereclause = " WHERE ".$whereclause if $whereclause;
-my $query = "SELECT biblio.timestamp, biblio.biblionumber, title, 
+
+my $query = "SELECT datecreated, biblio.biblionumber, title, 
                 author, sum( items.issues ) AS tot, biblioitems.itemtype,
                 biblioitems.publishercode,biblioitems.publicationyear,
                 itemtypes.description
@@ -74,6 +74,7 @@ my $query = "SELECT biblio.timestamp, biblio.biblionumber, title,
                 LEFT JOIN itemtypes ON itemtypes.itemtype = biblioitems.itemtype
                 $whereclause
                 GROUP BY biblio.biblionumber
+                HAVING tot >0
                 ORDER BY tot DESC
                 LIMIT $limit
                 ";
@@ -85,36 +86,35 @@ while (my $line= $sth->fetchrow_hashref) {
     push @results, $line;
 }
 
+my $timeLimitFinite = $timeLimit;
+if($timeLimit eq 999){ $timeLimitFinite = 0 };
+
 $template->param(do_it => 1,
                 limit => $limit,
-                branch => $branches->{$branch}->{branchname},
-                itemtype => $itemtypes->{$itemtype}->{description},
+                branch => $branches->{$branch}->{branchname} || 'all locations',
+                itemtype => $itemtypes->{$itemtype}->{description} || 'item types',
                 timeLimit => $timeLimit,
+                timeLimitFinite => $timeLimit,
                 results_loop => \@results,
                 );
 
-my $branches = GetBranches;
-my @branchloop;
-foreach my $thisbranch (keys %$branches) {
-        my %row =(value => $thisbranch,
-                    branchname => $branches->{$thisbranch}->{'branchname'},
-                        );
-        push @branchloop, \%row;
-}
+$template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}));
 
 #doctype
-my $itemtypes = GetItemTypes;
+$itemtypes = GetItemTypes;
 my @itemtypeloop;
-foreach my $thisitemtype (keys %$itemtypes) {
+foreach my $thisitemtype (sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) {
+        my $selected = 1 if $thisitemtype eq $itemtype;
         my %row =(value => $thisitemtype,
                     description => $itemtypes->{$thisitemtype}->{'description'},
-                        );
+                    selected => $selected,
+                 );
         push @itemtypeloop, \%row;
 }
 
 $template->param(
-                branchloop =>\@branchloop,
-                itemtypeloop =>\@itemtypeloop,
+                 itemtypeloop =>\@itemtypeloop,
+                 dateformat    => C4::Context->preference("dateformat"),
                 );
 output_html_with_http_headers $input, $cookie, $template->output;