X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reports%2Fitemtypes.plugin;h=ec2c535182d95b88ef37160d7c2ca49be75da05d;hb=8b714dc30c6c9440bbe9564d57fabb255070b64e;hp=2da9a88ef30912ba25b0ad9e6b1b6b822b23b263;hpb=30667f05551125fea51426724866afc8440af373;p=koha-ffzg.git

diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index 2da9a88ef3..ec2c535182 100755
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -25,18 +25,12 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
-use C4::Branch; # GetBranches
 =head1
 
 =cut
 
 sub set_parameters {
     my ($template) = @_;
-    my $userbranch = '';
-    if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
-        $userbranch = C4::Context->userenv->{'branch'};
-    }
-    $template->param( branchloop => GetBranchesLoop($userbranch) );
     return $template;
 }
 
@@ -46,57 +40,33 @@ sub calculate {
 	my $branch = @$parameters[0];
 	my $dbh = C4::Context->dbh;
 	my $sth;
-	if ($branch) {
-		if (C4::Context->preference('item-level_itypes')) {
-		$sth = $dbh->prepare("
-        SELECT itemtype, description, items.itype as itemtype, COUNT(*) AS total
-			FROM itemtypes,items         
-		WHERE items.itype=itemtypes.itemtype         
-		AND items.holdingbranch=?            
-		GROUP BY items.itype
-		ORDER BY itemtypes.description");
-
-		}
-		else {
-		$sth = $dbh->prepare("
-        SELECT itemtype, description, biblioitems.itemtype, COUNT(*) AS total
-			FROM itemtypes, biblioitems, items 
-		WHERE biblioitems.itemtype=itemtypes.itemtype 
-		AND items.biblioitemnumber=biblioitems.biblioitemnumber
-		AND items.holdingbranch=?
-			GROUP BY  biblioitems.itemtype
-			ORDER BY itemtypes.description");
-		}
-		$sth->execute($branch);
-	} else {
-		if (C4::Context->preference('item-level_itypes')) {
-		$sth = $dbh->prepare("
-        SELECT itemtype, description,items.itype AS itemtype, COUNT(*) AS total
-			FROM itemtypes,items
-		WHERE items.itype=itemtypes.itemtype
-			GROUP BY items.itype
-			ORDER BY itemtypes.description");
-		}
-		else {
-        $sth = $dbh->prepare("SELECT itemtype, description, biblioitems.itemtype, COUNT(*) AS total
-			FROM itemtypes, biblioitems,items 
-		WHERE biblioitems.itemtype=itemtypes.itemtype 
-		AND biblioitems.biblioitemnumber = items.biblioitemnumber
-			GROUP BY biblioitems.itemtype
-			ORDER BY itemtypes.description");
-		}
-		$sth->execute;
-	}
-    my ($itemtype, $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;
 	my $count = 0;
-    while (($itemtype, $description,$biblioitems,$total) = $sth->fetchrow) {
+    while (($itemtype, $description,$total) = $sth->fetchrow) {
 		my %line;
-		if($count % 2){
-			$line{toggle} = 1;
-			} else {
-				$line{toggle} = 0;
-			}
         $line{itemtype} = $itemtype;
 		$line{count} = $total;
 		$grantotal += $total;
@@ -108,7 +78,6 @@ sub calculate {
 	$globalline{loopitemtype} = \@results;
 	$globalline{total} = $grantotal;
 	$globalline{branch} = $branch;
-	$globalline{branchname} = GetBranchName($branch);
 	push @mainloop,\%globalline;
 	return \@mainloop;
 }