From e60b571d6d2ccd30cdf375d54ce2a954b8e48647 Mon Sep 17 00:00:00 2001 From: Garry Collum Date: Thu, 13 Aug 2009 20:31:39 -0400 Subject: [PATCH] Bug 2505: Enabled warnings in opac-topissues.pl Fixed resulting warnings and fixed a small bug with the timeLimit drop-down box. It would not retain its value on subsequent pages if 'no Limit' was selected as an option. Signed-off-by: Galen Charlton --- .../prog/en/modules/opac-topissues.tmpl | 22 +++++++++++-------- opac/opac-topissues.pl | 21 +++++++++++------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl index 3208fecb16..36ba710ba1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl @@ -45,8 +45,8 @@ function Dopop(link) { at - - in the past months + + in the past months of all time @@ -90,9 +90,11 @@ function Dopop(link) { @@ -100,9 +102,11 @@ function Dopop(link) {
  • @@ -129,4 +133,4 @@ function Dopop(link) { - \ No newline at end of file + diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl index 6b712260c6..80c4f0bdaf 100755 --- a/opac/opac-topissues.pl +++ b/opac/opac-topissues.pl @@ -19,6 +19,8 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; +use warnings; + use CGI; use C4::Auth; use C4::Context; @@ -52,14 +54,14 @@ 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; +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.datecreated) <= '.($timeLimit*30).' AND ' if $timeLimit < 999; -$whereclause =~ s/ AND $//; +$whereclause =~ s/ AND $// if $whereclause; $whereclause = " WHERE ".$whereclause if $whereclause; my $query = "SELECT datecreated, biblio.biblionumber, title, @@ -84,12 +86,13 @@ while (my $line= $sth->fetchrow_hashref) { push @results, $line; } -if($timeLimit eq 999){ $timeLimit = 0 }; +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, results_loop => \@results, ); @@ -100,9 +103,11 @@ $template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'} $itemtypes = GetItemTypes; my @itemtypeloop; 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; } -- 2.39.5