From: Steinar H. Gunderson <sesse@debian.org>
Date: Wed, 11 Apr 2007 23:57:36 +0000 (+0200)
Subject: Minor code cleanup.
X-Git-Url: https://git.sesse.net/?p=pr0n;a=commitdiff_plain;h=a7c6efeb91f8b8632f6bc37792cd28aa84b9b895;hp=a7bcf76062f3125f390a1b393b894873346f1c51

Minor code cleanup.
---

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 819d5af..c13b135 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");