Bug 26669: Last Run if report not always updated

[srvgit] / reports / itemtypes.plugin

diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
old mode 100644 (file)
new mode 100755 (executable)
index edaa6b6..ec2c535
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -1,84 +1,77 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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, see <http://www.gnu.org/licenses>.
 
 use strict;
 use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
-use HTML::Template;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
-
 =head1
 
 =cut
 
 sub set_parameters {
-       my ($template) = @_;
-       my $dbh = C4::Context->dbh;
-       my $branches=getbranches();
-       my @branches;
-       my @select_branch;
-       my %select_branches;
-       push @select_branch,"";
-       $select_branches{""} = "";
-       foreach my $branch (keys %$branches) {
-               push @select_branch, $branch;
-               $select_branches{$branch} = $branches->{$branch}->{'branchname'};
-       }
-       my $CGIbranch=CGI::scrolling_list( -name     => 'value',
-                               -id => 'value',
-                               -values   => \@select_branch,
-                               -labels   => \%select_branches,
-                               -size     => 1,
-                               -multiple => 0 );
-       $template->param(CGIbranch => $CGIbranch);
-       return $template;
+    my ($template) = @_;
+    return $template;
 }
+
 sub calculate {
        my ($parameters) = @_;
        my @results =();
        my $branch = @$parameters[0];
        my $dbh = C4::Context->dbh;
        my $sth;
-       if ($branch) {
-               $sth = $dbh->prepare("select description, biblioitems.itemtype, count(*) as total from itemtypes, biblioitems, items 
-                                               where biblioitems.itemtype=itemtypes.itemtype 
-                                                       and items.biblionumber=biblioitems.biblionumber
-                                                       and items.holdingbranch=?
-                                               group by biblioitems.itemtype");
-               $sth->execute($branch);
-       } else {
-               $sth = $dbh->prepare("select description, biblioitems.itemtype, count(*) as total from itemtypes, biblioitems where biblioitems.itemtype=itemtypes.itemtype group by biblioitems.itemtype");
-               $sth->execute;
-       }
-       my ($description,$biblioitems,$total);
+    if ( C4::Context->preference('item-level_itypes') ) {
+        $sth = $dbh->prepare( q|
+            SELECT itemtypes.itemtype, description, COUNT(*) AS total
+            FROM itemtypes, items
+            WHERE items.itype=itemtypes.itemtype
+            | . ( $branch ? q| AND items.holdingbranch=? | : () ) . q|
+            GROUP BY itemtypes.itemtype, description, items.itype
+            ORDER BY itemtypes.description
+        |);
+    }
+    else {
+        $sth = $dbh->prepare( q|
+            SELECT itemtypes.itemtype, description, COUNT(*) AS total
+            FROM itemtypes, biblioitems, items
+            WHERE biblioitems.itemtype=itemtypes.itemtype
+            AND items.biblioitemnumber=biblioitems.biblioitemnumber
+            | . ( $branch ? q| AND items.holdingbranch=? | : () ) . q|
+            GROUP BY itemtypes.itemtype, description
+            ORDER BY itemtypes.description
+        |);
+    }
+    $sth->execute($branch || ());
+    my ($itemtype, $description,$total);
        my $grantotal = 0;
-       while (($description,$biblioitems,$total) = $sth->fetchrow) {
+       my $count = 0;
+    while (($itemtype, $description,$total) = $sth->fetchrow) {
                my %line;
-               $line{itemtype} = $description;
+        $line{itemtype} = $itemtype;
                $line{count} = $total;
                $grantotal += $total;
                push @results,\%line;
+               $count ++;
        }
        my @mainloop;
        my %globalline;
@@ -89,4 +82,4 @@ sub calculate {
        return \@mainloop;
 }
 
-1;
\ No newline at end of file
+1;