Push v2.51 -- too many bugfixes to let the version number stay.

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 22e7195379744a08a783355fd08f9c8d75af1df5..acf43737098017210cc4dbb9227bb799ea424354 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -35,7 +35,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.49";
+       $VERSION     = "v2.51";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -244,10 +244,6 @@ sub update_image_info {
        {
                local $dbh->{AutoCommit} = 0;
 
-               $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
-                        undef, $width, $height, $datetime, $id)
-                       or die "Couldn't update width/height in SQL: $!";
-
                # EXIF information
                $dbh->do('DELETE FROM exif_info WHERE image=?',
                        undef, $id)
@@ -262,6 +258,24 @@ sub update_image_info {
                                or die "Couldn't insert EXIF information in database: $!";
                }
 
+               # Model/Lens
+               my $model = $exiftool->GetValue('Model', 'PrintConv');
+               my $lens = $exiftool->GetValue('Lens', 'PrintConv');
+               $lens = $exiftool->GetValue('LensSpec', 'PrintConv') if (!defined($lens));
+
+               $model =~ s/^\s*//;
+               $model =~ s/\s*$//;
+               $model = undef if (length($model) == 0);
+
+               $lens =~ s/^\s*//;
+               $lens =~ s/\s*$//;
+               $lens = undef if (length($lens) == 0);
+               
+               # Now update the main table with the information we've got
+               $dbh->do('UPDATE images SET width=?, height=?, date=?, model=?, lens=? WHERE id=?',
+                        undef, $width, $height, $datetime, $model, $lens, $id)
+                       or die "Couldn't update width/height in SQL: $!";
+               
                # Tags
                my @tags = $exiftool->GetValue('Keywords', 'ValueConv');
                $dbh->do('DELETE FROM tags WHERE image=?',
@@ -271,6 +285,7 @@ sub update_image_info {
                $q = $dbh->prepare('INSERT INTO tags (image,tag) VALUES (?,?)')
                        or die "Couldn't prepare inserting tag information: $!";
 
+
                for my $tag (@tags) {
                        $q->execute($id, guess_charset($tag))
                                or die "Couldn't insert tag information in database: $!";
@@ -356,7 +371,7 @@ sub ensure_cached {
        my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
 
        my $fname = get_disk_location($r, $id);
-       unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || $dbwidth == -1 || $dbheight == -1 || $xres == -1)) {
+       unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || !defined($dbwidth) || !defined($dbheight) || $xres == -1)) {
                return ($fname, 0);
        }
 
@@ -405,7 +420,7 @@ sub ensure_cached {
                my $height = $img->Get('rows');
 
                # Update the SQL database if it doesn't contain the required info
-               if ($dbwidth == -1 || $dbheight == -1) {
+               if (!defined($dbwidth) || !defined($dbheight)) {
                        $r->log->info("Updating width/height for $id: $width x $height");
                        update_image_info($r, $id, $width, $height);
                }
@@ -551,7 +566,7 @@ sub make_infobox {
                push @classic_fields, $info->{'ISOSetting'} . " ISO";
        }
 
-       if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0) {
+       if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
                push @classic_fields, $info->{'ExposureBiasValue'} . " EV";
        } elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
                push @classic_fields, $info->{'ExposureCompensation'} . " EV";