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");
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: $!";
my $toclose = 0;
my $lastupl = "";
- my $img_num = $start;
+ my $img_num = (defined($start) && defined($num)) ? $start : 1;
# Print out all thumbnails
if ($rot == 1) {
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'};
$end = $num_images;
}
- $r->print(" <p>\n");
+ $r->print(" <p class=\"nextprev\">\n");
# Previous
if ($start > 1) {