(Bug 4049) Searching itemtypes returning noise

[koha.git] / reports / catalogue_stats.pl

diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl
index c5d5ce0..f3b92b3 100755 (executable)
--- a/reports/catalogue_stats.pl
+++ b/reports/catalogue_stats.pl
@@ -19,6 +19,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+# use warnings;  # FIXME
 use C4::Auth;
 use CGI;
 use C4::Context;
@@ -51,8 +52,14 @@ my $cotedigits  = $input->param("cotedigits");
 my $output      = $input->param("output");
 my $basename    = $input->param("basename");
 my $mime        = $input->param("MIME");
-our $sep     = $input->param("sep");
+our $sep        = $input->param("sep");
 $sep = "\t" if ($sep eq 'tabulation');
+my $item_itype;
+if(C4::Context->preference('item-level_itypes')) {
+       $item_itype = "items\.itype"
+} else {
+       $item_itype = "itemtype";
+}
 
 my ($template, $borrowernumber, $cookie)
        = get_template_and_user({template_name => $fullreportname,
@@ -133,31 +140,19 @@ if ($do_it) {
 # No need to test for data here.  If you don't have itemcallnumbers, you probably know it.
 # FIXME: Hardcoding to 5 chars on itemcallnum. 
 #
-        my $hascote = 1;
-        my $highcote = 5;
-       
+    my $hascote = 1;
+    my $highcote = 5;
+
        $req = $dbh->prepare("select itemtype, description from itemtypes order by description");
        $req->execute;
        my $CGIitemtype = $req->fetchall_arrayref({});
 
        my $authvals = GetKohaAuthorisedValues("items.ccode");
        my @authvals;
-       foreach (keys %$authvals) {
+       foreach (sort {$authvals->{$a} cmp $authvals->{$b} || $a cmp $b} keys %$authvals) {
                push @authvals, { code => $_, description => $authvals->{$_} };
        }
        
-
-       my $branches=GetBranches();
-       my @branchloop;
-       foreach (keys %$branches) {
-               my $thisbranch = ''; # FIXME: populate $thisbranch to preselect one
-               my %row = (branchcode => $_,
-                       selected => ($thisbranch eq $_ ? 1 : 0),
-                       branchname => $branches->{$_}->{'branchname'},
-               );
-               push @branchloop, \%row;
-       }
-
        my $locations = GetKohaAuthorisedValues("items.location");
        my @locations;
        foreach (sort keys %$locations) {
@@ -170,11 +165,12 @@ if ($do_it) {
                                        haslccn   => $haslccn,
                                        hascote   => $hascote,
                                        CGIItemType => $CGIitemtype,
-                                       CGIBranch    => \@branchloop,
+                                       CGIBranch    => GetBranchesLoop(C4::Context->userenv->{'branch'}),
                                        locationloop => \@locations,
                                        authvals     => \@authvals,
                                        CGIextChoice => \@mime,
                                        CGIsepChoice => GetDelimiterChoices,
+                                       item_itype => $item_itype
                                        );
 
 }
@@ -249,7 +245,11 @@ if($barcodefilter){
        $linefilter[1] = @$filters[3] if ($line =~ /lccn/ )  ;
        $linefilter[0] = @$filters[4] if ($line =~ /items\.itemcallnumber/ )  ;
        $linefilter[1] = @$filters[5] if ($line =~ /items\.itemcallnumber/ )  ;
-       $linefilter[0] = @$filters[6] if ($line =~ /itemtype/ )  ;
+       if (C4::Context->preference('item-level_itypes')) {
+               $linefilter[0] = @$filters[6] if ($line =~ /items\.itype/ )  ;
+       } else {
+               $linefilter[0] = @$filters[6] if ($line =~ /itemtype/ )  ;
+       }
        $linefilter[0] = @$filters[7] if ($line =~ /publishercode/ ) ;
        $linefilter[0] = @$filters[8] if ($line =~ /publicationyear/ ) ;
        $linefilter[1] = @$filters[9] if ($line =~ /publicationyear/ ) ;
@@ -264,7 +264,11 @@ if($barcodefilter){
        $colfilter[1] = @$filters[3] if ($column =~ /lccn/ )  ;
        $colfilter[0] = @$filters[4] if ($column =~ /items\.itemcallnumber/ )  ;
        $colfilter[1] = @$filters[5] if ($column =~ /items\.itemcallnumber/ )  ;
-       $colfilter[0] = @$filters[6] if ($column =~ /itemtype/ )  ;
+       if (C4::Context->preference('item-level_itypes')) {
+               $colfilter[0] = @$filters[6] if ($column =~ /items\.itype/ )  ;
+       } else {
+               $colfilter[0] = @$filters[6] if ($column =~ /itemtype/ )  ;
+       }
        $colfilter[0] = @$filters[7] if ($column =~ /publishercode/ ) ;
        $colfilter[0] = @$filters[8] if ($column =~ /publicationyear/ ) ;
        $colfilter[1] = @$filters[9] if ($column =~ /publicationyear/ ) ;
@@ -409,7 +413,7 @@ if($barcodefilter){
        if (@$filters[6]){
                @$filters[6]=~ s/\*/%/g;
                $strcalc .= " AND " . 
-                       (C4::Context::preference('Item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype')
+                       (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype')
                        . " LIKE '" . @$filters[6] ."'";
        }