Bug 20428: Make upload_tmp a more general tmp directory

[koha.git] / circ / bookcount.pl

diff --git a/circ/bookcount.pl b/circ/bookcount.pl
index d4d3e54..438d851 100755 (executable)
--- a/circ/bookcount.pl
+++ b/circ/bookcount.pl
@@ -20,8 +20,7 @@
 # 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 warnings; FIXME - Bug 2505
+use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Debug;
 use C4::Context;
@@ -29,22 +28,20 @@ use C4::Circulation;
 use C4::Output;
 use C4::Koha;
 use C4::Auth;
-use C4::Branch; # GetBranches
-use C4::Biblio; # GetBiblioItemData
+use Koha::Biblios;
 use Koha::DateUtils;
 use Koha::Libraries;
 
 my $input        = new CGI;
 my $itm          = $input->param('itm');
-my $bi           = $input->param('bi');
 my $biblionumber = $input->param('biblionumber');
-my $branches     = GetBranches;
 
-my $idata = itemdatanum($itm);
-my $data  = GetBiblioItemData($bi);
+my $biblio = Koha::Biblios->find( $biblionumber );
+my $item   = Koha::Items->find( $itm );
 
-my $homebranch    = $branches->{ $idata->{'homebranch'}    }->{'branchname'};
-my $holdingbranch = $branches->{ $idata->{'holdingbranch'} }->{'branchname'};
+if ( !defined $biblio or !defined $item ) {
+    print $input->redirect("/cgi-bin/koha/errors/400.pl");
+}
 
 my $lastmove = lastmove($itm);
 
@@ -79,12 +76,11 @@ for my $library ( @$libraries ) {
 
 $template->param(
     biblionumber            => $biblionumber,
-    title                   => $data->{'title'},
-    author                  => $data->{'author'},
-    barcode                 => $idata->{'barcode'},
-    biblioitemnumber        => $bi,
-    homebranch              => $homebranch,
-    holdingbranch           => $holdingbranch,
+    title                   => $biblio->title,
+    author                  => $biblio->author,
+    barcode                 => $item->barcode,
+    homebranch              => $item->homebranch,
+    holdingbranch           => $item->holdingbranch,
     lastdate                => $lastdate ? $lastdate : 0,
     count                   => $count,
     libraries               => $libraries,
@@ -93,13 +89,6 @@ $template->param(
 output_html_with_http_headers $input, $cookie, $template->output;
 exit;
 
-sub itemdatanum {
-    my ($itemnumber) = @_;
-    my $sth = C4::Context->dbh->prepare("SELECT * FROM items WHERE itemnumber=?");
-    $sth->execute($itemnumber);
-    return $sth->fetchrow_hashref;
-}
-
 sub lastmove {
     my ($itemnumber) = @_;
     my $dbh = C4::Context->dbh;