X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=681a6652df6acf3772c2b09d693c6f67d7443cc2;hb=05b2a05f2335a321b0515d9f3992510c3b3b80a0;hp=f8f44048ff385a6bdfaa3ed5f506b84fcd8d0f7f;hpb=a5c13b107460a55b50424d6c6bd6a77abf71300d;p=pr0n diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index f8f4404..681a665 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"); @@ -154,16 +149,18 @@ sub handler { print_fullscreen($r, $event, \%settings, \%defsettings); # Find the equipment used - my $eq = $dbh->prepare(' - SELECT DISTINCT - model.value AS model, - coalesce(lens_spec.value, lens.value) AS lens - FROM images i + my $eq = $dbh->prepare(" + SELECT + TRIM(model.value) AS model, + coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens, + COUNT(*) AS num + 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\' - ORDER BY 1,2') + 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") or die "Couldn't prepare to find equipment: $!"; $eq->execute($event) or die "Couldn't find equipment: $!"; @@ -175,8 +172,9 @@ sub handler { # # Some compact cameras seem to add lens info sometimes and not at other # times; if we have seen a camera with at least one specific lens earlier, - # just ignore entries without a lens. + # just combine entries without a lens with the previous one. # + $equipment[$#equipment]->{'num'} += $ref->{'num'}; next; } push @equipment, $ref; @@ -187,11 +185,14 @@ sub handler { if (scalar @equipment > 0) { Sesse::pr0n::Templates::print_template($r, "equipment-start"); for my $e (@equipment) { - $r->print("
\n"); + print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); + $r->print("\n"); + $r->print("
\n");
}
if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
my $width = $ref->{'width'};
@@ -315,6 +286,8 @@ sub handler {
}
$r->print(" \n");
+
+ ++$img_num;
}
$r->print("
"); + Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); + $r->print("
\n"); +} 1;