Bug 17600: Standardize our EXPORT_OK

[srvgit] / catalogue / imageviewer.pl

diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
index 011dfab..e9c43a3 100755 (executable)
--- a/catalogue/imageviewer.pl
+++ b/catalogue/imageviewer.pl
@@ -4,78 +4,91 @@
 #
 # 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 warnings;
+use Modern::Perl;
 
-use CGI;
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
-use C4::Images;
-use C4::Search;
+use CGI qw ( -utf8 );
+use C4::Auth qw( get_template_and_user );
+use C4::Items qw( GetItemsInfo );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Search qw( enabled_staff_search_views );
 
-my $query = new CGI;
+use Koha::Biblios;
+use Koha::Items;
+use Koha::Patrons;
+
+my $query = CGI->new;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "catalogue/imageviewer.tmpl",
+        template_name   => "catalogue/imageviewer.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
 
-my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my $itemnumber  = $query->param('itemnumber');
+my $biblionumber = $query->param('biblionumber') || $query->param('bib') || Koha::Items->find($itemnumber)->biblionumber;
 my $imagenumber = $query->param('imagenumber');
-my ( $count, $biblio ) = GetBiblio($biblionumber);
-my $itemcount = GetItemsCount($biblionumber);
-
+my $biblio = Koha::Biblios->find( $biblionumber );
+my $itemcount = $biblio ? $biblio->items->count : 0;
 my @items = GetItemsInfo($biblionumber);
 
-my $norequests = 1;
-foreach my $item (@items) {
-
-    # can place holds defaults to yes
-    $norequests = 0
-      unless ( ( $item->{'notforloan_per_itemtype'} > 0 )
-        || ( $item->{'itemnotforloan'} > 0 ) );
-}
-
 if ( $query->cookie("holdfor") ) {
-    my $holdfor_patron =
-      GetMember( 'borrowernumber' => $query->cookie("holdfor") );
+    my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
     $template->param(
         holdfor            => $query->cookie("holdfor"),
-        holdfor_surname    => $holdfor_patron->{'surname'},
-        holdfor_firstname  => $holdfor_patron->{'firstname'},
-        holdfor_cardnumber => $holdfor_patron->{'cardnumber'},
+        holdfor_surname    => $holdfor_patron->surname,
+        holdfor_firstname  => $holdfor_patron->firstname,
+        holdfor_cardnumber => $holdfor_patron->cardnumber,
+    );
+}
+
+if( $query->cookie("searchToOrder") ){
+    my ( $basketno, $vendorid ) = split( /\//, $query->cookie("searchToOrder") );
+    $template->param(
+        searchtoorder_basketno => $basketno,
+        searchtoorder_vendorid => $vendorid
     );
 }
 
 if ( C4::Context->preference("LocalCoverImages") ) {
-    my @images = ListImagesForBiblio($biblionumber);
-    $template->{VARS}->{'LocalCoverImages'} = 1;
-    $template->{VARS}->{'images'}           = \@images;
-    $template->{VARS}->{'imagenumber'}      = $imagenumber || $images[0] || '';
+    my $images;
+    if ( $itemnumber ) {
+        my $item = Koha::Items->find($itemnumber);
+        $images = $item->cover_images->as_list;
+    } else {
+        $images = $biblio->cover_images->as_list;
+    }
+
+    $template->param(
+        LocalCoverImages => 1,
+        images           => $images,
+        imagenumber      => ( $imagenumber || ( @$images ? $images->[0]->imagenumber : undef ) ),
+    );
 }
 $template->{VARS}->{'count'}        = $itemcount;
-$template->{VARS}->{'biblionumber'} = $biblionumber;
-$template->{VARS}->{'norequests'}   = $norequests;
 $template->param(C4::Search::enabled_staff_search_views);
 $template->{VARS}->{'biblio'} = $biblio;
 
+$template->param(
+    biblionumber => $biblionumber,
+    itemnumber => $itemnumber,
+);
+
+my $hold_count = $biblio ? $biblio->holds->count : 0;
+$template->param( holdcount => $hold_count );
+
 output_html_with_http_headers $query, $cookie, $template->output;