X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=0fbd82893b41051d8a944eecbf3228844a899e10;hp=74d5329d5cbc376207ae2e527b051c5202fa4f79;hb=211db32f412b945988bae2a6014ff76017c42282;hpb=82b2e541984df6f697a5a73f2faaa99e40dfc832

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 74d5329..0fbd828 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -127,17 +127,16 @@ sub handler {
 
 		if ($model eq '') {
 			# no defined model
-			$where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)<>'' )";
+			$where .= " AND model IS NULL";
 		} else {
-			$where .= " AND id IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)=$mq )";
+			$where .= " AND model=$mq";
 		}
 	
-		# This doesn't match 1:1 if there's both lens and lensspec, but it should be OK in practice
 		if ($lens eq '') {
 			# no defined lens
-			$where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)<>'' )";
+			$where .= " AND lens IS NULL";
 		} else {
-			$where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )";
+			$where .= " AND lens=$lq";
 		}
 	}
 	if (defined($author)) {
@@ -215,14 +214,27 @@ sub handler {
 
 		my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" .
 			Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings);
+		
+		my %settings_bookmark = %settings;
+		$settings_bookmark{'start'} = $defsettings{'start'};
+		my $bookmark_url_base = "http://" . $r->get_server_name . "/" . $event . "/" .
+			Sesse::pr0n::Common::get_query_string(\%settings_bookmark, \%defsettings);
+
+		if ($bookmark_url_base =~ /\?/) {
+			$bookmark_url_base .= ';start=';
+		} else {
+			$bookmark_url_base .= '?start=';
+		}
 
 		# *whistle*
 		$returnurl =~ s/&amp;/&/g;
+		$bookmark_url_base =~ s/&amp;/&/g;
 
 		Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
 			vhost => $r->get_server_name,
 			start => $settings{'start'} - 1,
 			returnurl => $returnurl,
+			bookmarkurlbase => $bookmark_url_base,
 			sel => $settings{'sel'},
 			infobox => $infobox
 		});
@@ -252,15 +264,12 @@ sub handler {
 		if (1 || $event ne '+all') {
 			# Find the equipment used
 			my $eq = $dbh->prepare("
-				SELECT 
-					TRIM(model.value) AS model,
-					coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens,
+				SELECT
+					model,
+					lens,
 					COUNT(*) AS num
-				FROM ( SELECT * FROM images WHERE vhost=? $where ) i
-					LEFT JOIN exif_info model ON i.id=model.image
-					LEFT JOIN ( SELECT * FROM exif_info WHERE key='Lens' ) lens ON i.id=lens.image
-					LEFT JOIN ( SELECT * FROM exif_info WHERE key='LensSpec') lens_spec ON i.id=lens_spec.image
-				WHERE model.key='Model'
+				FROM images
+				WHERE vhost=? $where
 				GROUP BY 1,2
 				ORDER BY 1,2")
 				or die "Couldn't prepare to find equipment: $!";