X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-topissues.pl;h=38c6df0b24382f9f84d92fd1a838dd9225ec63e8;hb=ced4ca4e2d39856b4f00411eaee406b569199c1f;hp=80e7c35aba235742c21b3eeca901e6f102cc98dd;hpb=2ea6fdec156419fbbdd5f64da927d0b2b45e751c;p=koha.git

diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 80e7c35aba..38c6df0b24 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.
 #
@@ -83,7 +84,14 @@ if($advanced_search_types eq 'ccode'){
                     ";
     $template->param(ccodesearch => 1);
 }else{
-    $whereclause .= ' AND biblioitems.itemtype='.$dbh->quote($itemtype) if $itemtype;
+    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,
@@ -114,35 +122,34 @@ if($timeLimit eq 999){ $timeLimitFinite = 0 };
 
 $template->param(do_it => 1,
                 limit => $limit,
-                branch => $branches->{$branch}->{branchname} || 'all locations',
-                itemtype => $itemtypes->{$itemtype}->{description} || 'item types',
+                branch => $branches->{$branch}->{branchname},
+                itemtype => $itemtypes->{$itemtype}->{description},
                 timeLimit => $timeLimit,
-                timeLimitFinite => $timeLimit,
+                timeLimitFinite => $timeLimitFinite,
                 results_loop => \@results,
                 );
 
-$template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}));
+$template->param( branchloop => GetBranchesLoop(C4::Context->userenv?C4::Context->userenv->{'branch'}:''));
 
 # the index parameter is different for item-level itemtypes
 my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
 $itemtypes = GetItemTypes;
 my @itemtypesloop;
-my $selected=1;
 if (!$advanced_search_types or $advanced_search_types eq '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,
+                   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 $selected;
+            $selected = 1 if $thisitemtype->{authorised_value} eq $itemtype;
                 my %row =( value => $thisitemtype->{authorised_value},
-                selected => $selected,
+                selected    => $thisitemtype eq $itemtype,
                 description => $thisitemtype->{'lib'},
             );
                 push @itemtypesloop, \%row;
@@ -151,7 +158,6 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
 
 $template->param(
                  itemtypeloop =>\@itemtypesloop,
-                 dateformat    => C4::Context->preference("dateformat"),
                 );
 output_html_with_http_headers $input, $cookie, $template->output;