X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-topissues.pl;h=05b7a278d1c4ee17d8e46acf7a4c7c2c70042a27;hb=d91bb113f04149c020c851a904de69619b6e9dd8;hp=f47c138cefbc9be14179dd2fe1d79b810a514c0b;hpb=093e3f52154aa15d16cadd497ad3ceadbee78fbf;p=koha_fer diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl index f47c138cef..05b7a278d1 100755 --- a/opac/opac-topissues.pl +++ b/opac/opac-topissues.pl @@ -2,6 +2,7 @@ # Copyright 2000-2002 Katipo Communications +# Parts Copyright Catalyst IT 2011 # # This file is part of Koha. # @@ -14,11 +15,13 @@ # 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +use warnings; + use CGI; use C4::Auth; use C4::Context; @@ -34,8 +37,6 @@ plugin that shows a stats on borrowers =head1 DESCRIPTION -=over 2 - =cut my $input = new CGI; @@ -46,36 +47,68 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => 'opac-topissues.tmpl', query => $input, type => "opac", - authnotrequired => 1, + authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), debug => 1, }); 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); -$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 = " WHERE ".$whereclause if $whereclause; - -my $query = "SELECT datecreated, biblio.biblionumber, title, - author, sum( items.issues ) AS tot, biblioitems.itemtype, - biblioitems.publishercode,biblioitems.publicationyear, - itemtypes.description - FROM biblio - LEFT JOIN items USING (biblionumber) - LEFT JOIN biblioitems USING (biblionumber) - LEFT JOIN itemtypes ON itemtypes.itemtype = biblioitems.itemtype - $whereclause - GROUP BY biblio.biblionumber - HAVING tot >0 - ORDER BY tot DESC - LIMIT $limit - "; +my $advanced_search_types = C4::Context->preference('AdvancedSearchTypes'); + +my $whereclause = ''; +$whereclause .= ' AND items.homebranch='.$dbh->quote($branch) if ($branch); +$whereclause .= ' AND TO_DAYS(NOW()) - TO_DAYS(biblio.datecreated) <= '.($timeLimit*30) if $timeLimit < 999; +$whereclause =~ s/ AND $// if $whereclause; +my $query; + +if($advanced_search_types eq 'ccode'){ + $whereclause .= ' AND authorised_values.authorised_value='.$dbh->quote($itemtype) if $itemtype; + $query = "SELECT datecreated, biblio.biblionumber, title, + author, sum( items.issues ) AS tot, biblioitems.itemtype, + biblioitems.publishercode,biblioitems.publicationyear, + authorised_values.lib as description + FROM biblio + LEFT JOIN items USING (biblionumber) + LEFT JOIN biblioitems USING (biblionumber) + LEFT JOIN authorised_values ON items.ccode = authorised_values.authorised_value + WHERE 1 + $whereclause + AND authorised_values.category = 'ccode' + GROUP BY biblio.biblionumber + HAVING tot >0 + ORDER BY tot DESC + LIMIT $limit + "; + $template->param(ccodesearch => 1); +}else{ + if ($itemtype){ + if (C4::Context->preference('item-level_itypes')){ + $whereclause .= ' AND items.itype = ' . $dbh->quote($itemtype); + } + else { + $whereclause .= ' AND biblioitems.itemtype='.$dbh->quote($itemtype); + } + } + $query = "SELECT datecreated, biblio.biblionumber, title, + author, sum( items.issues ) AS tot, biblioitems.itemtype, + biblioitems.publishercode,biblioitems.publicationyear, + itemtypes.description + FROM biblio + LEFT JOIN items USING (biblionumber) + LEFT JOIN biblioitems USING (biblionumber) + LEFT JOIN itemtypes ON itemtypes.itemtype = biblioitems.itemtype + WHERE 1 + $whereclause + GROUP BY biblio.biblionumber + HAVING tot >0 + ORDER BY tot DESC + LIMIT $limit + "; + $template->param(itemtypesearch => 1); +} my $sth = $dbh->prepare($query); $sth->execute(); @@ -84,42 +117,47 @@ 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, + timeLimitFinite => $timeLimit, results_loop => \@results, ); -# load the branches ## again?? -$branches = GetBranches(); -my @branch_loop; -for my $branch_hash (sort keys %$branches ) { - my $selected=(C4::Context->userenv && ($branch_hash eq C4::Context->userenv->{branch})) if (C4::Context->preference('SearchMyLibraryFirst')); - push @branch_loop, - { - value => "$branch_hash", - branchname => $branches->{$branch_hash}->{'branchname'}, - selected => $selected - }; -} -$template->param( branchloop => \@branch_loop, "mylibraryfirst"=>C4::Context->preference("SearchMyLibraryFirst")); +$template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'})); -#doctype +# the index parameter is different for item-level itemtypes +my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; $itemtypes = GetItemTypes; -my @itemtypeloop; -foreach my $thisitemtype (keys %$itemtypes) { - my %row =(value => $thisitemtype, - description => $itemtypes->{$thisitemtype}->{'description'}, - ); - push @itemtypeloop, \%row; +my @itemtypesloop; +if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { + foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) { + my %row =( value => $thisitemtype, + description => $itemtypes->{$thisitemtype}->{'description'}, + selected => $thisitemtype eq $itemtype, + ); + push @itemtypesloop, \%row; + } +} else { + my $advsearchtypes = GetAuthorisedValues($advanced_search_types, '', 'opac'); + for my $thisitemtype (@$advsearchtypes) { + my $selected = 1 if $thisitemtype->{authorised_value} eq $itemtype; + my %row =( value => $thisitemtype->{authorised_value}, + selected => $thisitemtype eq $itemtype, + description => $thisitemtype->{'lib'}, + ); + push @itemtypesloop, \%row; + } } $template->param( - itemtypeloop =>\@itemtypeloop, + itemtypeloop =>\@itemtypesloop, + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output;