Bug 10403: (follow-up) fix test to use vendor created earlier during test

[koha.git] / opac / opac-image.pl

diff --git a/opac/opac-image.pl b/opac/opac-image.pl
index 444c127..e2dc556 100755 (executable)
--- a/opac/opac-image.pl
+++ b/opac/opac-image.pl
@@ -1,5 +1,8 @@
 #!/usr/bin/perl
 #
+# Copyright (C) 2011 C & P Bibliography Services
+# Jared Camins-Esakov <jcamins@cpbibliograpy.com>
+#
 # based on patronimage.pl
 #
 # This file is part of Koha.
@@ -23,14 +26,14 @@
 use strict;
 use warnings;
 
-use CGI; #qw(:standard escapeHTML);
+use CGI;
 use C4::Context;
 use C4::Images;
 
-$|=1;
+$| = 1;
 
 my $DEBUG = 0;
-my $data = new CGI;
+my $data  = new CGI;
 my $imagenumber;
 
 =head1 NAME
@@ -55,49 +58,43 @@ imagenumber, a random image is selected.
 
 =cut
 
-if (defined $data->param('imagenumber')) {
-    $imagenumber = $data->param('imagenumber');
-} elsif (defined $data->param('biblionumber')) {
-    my @imagenumbers = ListImagesForBiblio($data->param('biblionumber'));
-    if (@imagenumbers) {
-        $imagenumber = $imagenumbers[0];
-    } else {
-        warn "No images for this biblio" if $DEBUG;
-        error();
+my ( $image, $mimetype ) = C4::Images->NoImage;
+if ( C4::Context->preference("OPACLocalCoverImages") ) {
+    if ( defined $data->param('imagenumber') ) {
+        $imagenumber = $data->param('imagenumber');
     }
-} else {
-    $imagenumber = shift;
-}
-
-if ($imagenumber) {
-    warn "imagenumber passed in: $imagenumber" if $DEBUG;
-    my $imagedata = RetrieveImage($imagenumber);
-
-    error() unless $imagedata;
-
-    if ($imagedata) {
-        my $image;
-        if ($data->param('thumbnail')) {
-            $image = $imagedata->{'thumbnail'};
-        } else {
-            $image = $imagedata->{'imagefile'};
+    elsif ( defined $data->param('biblionumber') ) {
+        my @imagenumbers = ListImagesForBiblio( $data->param('biblionumber') );
+        if (@imagenumbers) {
+            $imagenumber = $imagenumbers[0];
+        }
+        else {
+            warn "No images for this biblio" if $DEBUG;
         }
-        print $data->header (-type => $imagedata->{'mimetype'}, -'Cache-Control' => 'no-store', -expires => 'now', -Content_Length => length ($image)), $image;
-        exit;
-    } else {
-        warn "No image exists for $imagenumber" if $DEBUG;
-        error();
     }
-} else {
-    error();
-}
-
-error();
+    else {
+        $imagenumber = shift;
+    }
 
-sub error {
-    print $data->header ( -status=> '404', -expires => 'now' );
-    exit;
+    if ($imagenumber) {
+        warn "imagenumber passed in: $imagenumber" if $DEBUG;
+        my $imagedata = RetrieveImage($imagenumber);
+        if ($imagedata) {
+            if ( $data->param('thumbnail') ) {
+                $image = $imagedata->{'thumbnail'};
+            }
+            else {
+                $image = $imagedata->{'imagefile'};
+            }
+            $mimetype = $imagedata->{'mimetype'};
+        }
+    }
 }
+print $data->header(
+    -type            => $mimetype,
+    -expires         => '+30m',
+    -Content_Length  => length($image)
+), $image;
 
 =head1 AUTHOR