X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FImages.pm;h=4bae00ca7a019e879119f8681eaecc63138a68d1;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=209cde05c47aabad6bd7ccce37fcf0d350fb8c64;hpb=d508f0244bd288066d62dcaa40244702b2581514;p=koha.git

diff --git a/C4/Images.pm b/C4/Images.pm
index 209cde05c4..4bae00ca7a 100644
--- a/C4/Images.pm
+++ b/C4/Images.pm
@@ -25,12 +25,12 @@ use 5.010;
 use C4::Context;
 use GD;
 
-use vars qw($debug $VERSION @ISA @EXPORT);
+use vars qw($debug $noimage $VERSION @ISA @EXPORT);
 
 BEGIN {
 
     # set the version for version checking
-    $VERSION = 3.03;
+    $VERSION = 3.07.00.049;
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
@@ -40,6 +40,11 @@ BEGIN {
       &DelImage
     );
     $debug = $ENV{KOHA_DEBUG} || $ENV{DEBUG} || 0;
+
+    $noimage = pack( "H*",
+            '47494638396101000100800000FFFFFF'
+          . '00000021F90401000000002C00000000'
+          . '010001000002024401003B' );
 }
 
 =head2 PutImage
@@ -101,13 +106,14 @@ sub RetrieveImage {
     my $sth = $dbh->prepare($query);
     $sth->execute($imagenumber);
     my $imagedata = $sth->fetchrow_hashref;
-    if ( $sth->err ) {
-        warn "Database error!";
-        return undef;
+    if ( !$imagedata ) {
+        $imagedata->{'thumbnail'} = $noimage;
+        $imagedata->{'imagefile'} = $noimage;
     }
-    else {
-        return $imagedata;
+    if ( $sth->err ) {
+        warn "Database error!" if $debug;
     }
+    return $imagedata;
 }
 
 =head2 ListImagesForBiblio
@@ -125,16 +131,10 @@ sub ListImagesForBiblio {
     my $query = 'SELECT imagenumber FROM biblioimages WHERE biblionumber = ?';
     my $sth   = $dbh->prepare($query);
     $sth->execute($biblionumber);
-    warn "Database error!" if $sth->errstr;
-    if ( !$sth->errstr && $sth->rows > 0 ) {
-        while ( my $row = $sth->fetchrow_hashref ) {
-            push @imagenumbers, $row->{'imagenumber'};
-        }
-        return @imagenumbers;
-    }
-    else {
-        return undef;
+    while ( my $row = $sth->fetchrow_hashref ) {
+        push @imagenumbers, $row->{'imagenumber'};
     }
+    return @imagenumbers;
 }
 
 =head2 DelImage
@@ -192,4 +192,17 @@ sub _scale_image {
     }
 }
 
+=head2 NoImage
+
+    C4::Images->NoImage;
+
+Returns the gif to be used when there is no image matching the request, and
+its mimetype (image/gif).
+
+=cut
+
+sub NoImage {
+    return $noimage, 'image/gif';
+}
+
 1;