X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=849870f4ec8e8add783689ce96967823eb0d0804;hp=819d5af71e262f14ca0647d316aa0b745d321f37;hb=fddc182ea1420b4dd630bdfde6c49d79f3ba51b3;hpb=a47ee01cd25f9917b6d8527d933c002f4bcd47ad

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 819d5af..849870f 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -100,16 +100,11 @@ sub handler {
 	my $num_selected = $ref->{'num_selected'};
 
 	# Find all images related to this event.
-	my $q;
 	my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
+	my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : "";
 
-	if (defined($start) && defined($num) && !$settings{'fullscreen'}) {
-		$q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename LIMIT $num OFFSET " . ($start-1))
-			or dberror($r, "prepare()");
-	} else {
-		$q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename")
-			or dberror($r, "prepare()");
-	}
+	my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit")
+		or dberror($r, "prepare()");
 	$q->execute($event)
 		or dberror($r, "image enumeration");
 
@@ -149,23 +144,23 @@ sub handler {
 		print_viewres($r, $event, \%settings, \%defsettings);
 		print_pagelimit($r, $event, \%settings, \%defsettings);
 		print_infobox($r, $event, \%settings, \%defsettings);
-		print_nextprev($r, $event, \%settings, \%defsettings);
 		print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0);
 		print_fullscreen($r, $event, \%settings, \%defsettings);
+		print_nextprev($r, $event, \%settings, \%defsettings);
 		
 		# Find the equipment used
-		my $eq = $dbh->prepare('
+		my $eq = $dbh->prepare("
 			SELECT 
 				TRIM(model.value) AS model,
 				coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens,
 				COUNT(*) AS num
-			FROM images i
+			FROM ( SELECT * FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit ) i
 				LEFT JOIN exif_info model ON i.id=model.image
-				LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'Lens\' ) lens ON i.id=lens.image
-				LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'LensSpec\') lens_spec ON i.id=lens_spec.image
-			WHERE event=? AND model.tag=\'Model\'
+				LEFT JOIN ( SELECT * FROM exif_info WHERE tag='Lens' ) lens ON i.id=lens.image
+				LEFT JOIN ( SELECT * FROM exif_info WHERE tag='LensSpec') lens_spec ON i.id=lens_spec.image
+			WHERE model.tag='Model'
 			GROUP BY 1,2
-			ORDER BY 1,2')
+			ORDER BY 1,2")
 			or die "Couldn't prepare to find equipment: $!";
 		$eq->execute($event)
 			or die "Couldn't find equipment: $!";
@@ -438,13 +433,15 @@ sub print_nextprev {
 	my ($r, $event, $settings, $defsettings) = @_;
 	my $start = $settings->{'start'};
 	my $num = $settings->{'num'};
+	my $all = $settings->{'all'};
 	my $dbh = Sesse::pr0n::Common::get_dbh();
+	my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
 
 	$num = undef if (defined($num) && $num == -1);
 	return unless (defined($start) && defined($num));
 
 	# determine total number
-	my $ref = $dbh->selectrow_hashref('SELECT count(*) AS num_images FROM images WHERE event=?',
+	my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE event=? $where",
 		undef, $event)
 		or dberror($r, "image enumeration");
 	my $num_images = $ref->{'num_images'};
@@ -456,7 +453,7 @@ sub print_nextprev {
 		$end = $num_images;
 	}
 
-	$r->print("    <p>\n");
+	$r->print("    <p class=\"nextprev\">\n");
 
 	# Previous
 	if ($start > 1) {