From a7c6efeb91f8b8632f6bc37792cd28aa84b9b895 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 12 Apr 2007 01:57:36 +0200 Subject: [PATCH] Minor code cleanup. --- perl/Sesse/pr0n/Index.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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"); -- 2.39.2