X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=70ac117d1eb4f2cb6d2261d351a722cadc39e75c;hp=3597deeaff849d37d19cacffd3da4d9a4ce9eb08;hb=1a0b46de9ea9518a6150226144dbe8f60e984d17;hpb=3bde4ccddbb9473fff56752d7100332d48affa1a

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 3597dee..70ac117 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -77,7 +77,7 @@ sub handler {
 	}
 	
 	# Any NEF files => default to processing
-	my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND LOWER(filename) LIKE '%.nef' LIMIT 1",
+	my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) LIMIT 1",
 		undef, $r->get_server_name)
 		and $defsettings{'xres'} = $defsettings{'yres'} = undef;
 	
@@ -96,7 +96,7 @@ sub handler {
 		if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) {
 			$settings{$s} = $val;
 		}
-		if ($s eq "model" || $s eq "lens" || $s eq "author") {
+		if (($s eq "model" || $s eq "lens" || $s eq "author") && defined($val)) {
 			$settings{$s} = Sesse::pr0n::Common::pretty_unescape($val);
 		}
 	}