X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=849870f4ec8e8add783689ce96967823eb0d0804;hp=a00cadf8e23dba933ab70d1869f2ee81a2350353;hb=fddc182ea1420b4dd630bdfde6c49d79f3ba51b3;hpb=312aab3d35a5472261ade2926fa7fb75a303e798 diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index a00cadf..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: $!"; @@ -222,8 +217,10 @@ sub handler { if ($takenby ne $lastupl) { $lastupl = $takenby; + $r->print("

"); Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); + $r->print("

\n"); } if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { my $width = $ref->{'width'}; @@ -255,48 +252,6 @@ sub handler { } $r->print(" \n"); $r->print(" \n"); - } elsif ($sel == 1) { - $r->print("
\n"); - $r->print(" \n"); - - while (my $ref = $q->fetchrow_hashref()) { - my $imgsz = ""; - my $takenby = $ref->{'takenby'}; - if (defined($ref->{'day'})) { - $takenby .= ", " . $ref->{'day'}; - } - - if ($takenby ne $lastupl) { - $lastupl = $takenby; - Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); - print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); - } - if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { - my $width = $ref->{'width'}; - my $height = $ref->{'height'}; - - ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres); - $imgsz = " width=\"$width\" height=\"$height\""; - } - - my $filename = $ref->{'filename'}; - my $uri = $infobox . $filename; - if (defined($xres) && defined($yres) && $xres != -1) { - $uri = "${xres}x$yres/$infobox$filename"; - } elsif (defined($xres) && $xres == -1) { - $uri = "original/$infobox$filename"; - } - - my $selected = $ref->{'selected'} ? ' checked="checked"' : ''; - - $r->print("

\"\"$imgsz\n"); - $r->print(" {'id'} . "\"$selected />

\n"); - - ++$img_num; - } - $r->print(" \n"); - $r->print("
\n"); } else { while (my $ref = $q->fetchrow_hashref()) { my $imgsz = ""; @@ -308,9 +263,11 @@ sub handler { if ($takenby ne $lastupl) { $r->print("

\n\n") if ($lastupl ne ""); $lastupl = $takenby; + $r->print("

"); Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); - $r->print("

\n"); + $r->print("

\n"); + $r->print("

\n"); } if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { my $width = $ref->{'width'}; @@ -476,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'}; @@ -494,7 +453,7 @@ sub print_nextprev { $end = $num_images; } - $r->print("

\n"); + $r->print("

\n"); # Previous if ($start > 1) {