X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=849870f4ec8e8add783689ce96967823eb0d0804;hb=fddc182ea1420b4dd630bdfde6c49d79f3ba51b3;hp=f8f44048ff385a6bdfaa3ed5f506b84fcd8d0f7f;hpb=a5c13b107460a55b50424d6c6bd6a77abf71300d;p=pr0n diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index f8f4404..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,21 +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(' - 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("
  • " . $e->{'model'}); - if (defined($e->{'lens'})) { - $r->print(", " . $e->{'lens'} . "
    • \n"); + my $eqspec = $e->{'model'}; + $eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'})); + + # This isn't correct for all languages. Fix if we ever need to care. :-) + if ($e->{'num'} == 1) { + Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec }); } else { - $r->print("\n"); + Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} }); } } Sesse::pr0n::Templates::print_template($r, "equipment-end"); @@ -200,12 +201,13 @@ sub handler { my $toclose = 0; my $lastupl = ""; + my $img_num = $start; # Print out all thumbnails if ($rot == 1) { $r->print("
    \n"); $r->print(" \n"); - + while (my $ref = $q->fetchrow_hashref()) { my $imgsz = ""; my $takenby = $ref->{'takenby'}; @@ -215,7 +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'}; @@ -242,48 +247,11 @@ sub handler { $ref->{'id'} . "-270\" />\n"); $r->print("        " . "     Del {'id'} . "\" />

    \n"); + + ++$img_num; } $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 }); - } - 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"); - } - $r->print(" \n"); - $r->print("
    \n"); } else { while (my $ref = $q->fetchrow_hashref()) { my $imgsz = ""; @@ -295,8 +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 }); - $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(" \"\"$imgsz\n"); + + ++$img_num; } $r->print("

    \n"); } @@ -460,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'}; @@ -478,7 +453,7 @@ sub print_nextprev { $end = $num_images; } - $r->print("

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

    \n"); # Previous if ($start > 1) { @@ -562,6 +537,20 @@ sub print_fullscreen { Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); $r->print("

    \n"); } + +sub print_fullscreen_fromhere { + my ($r, $event, $settings, $defsettings, $start) = @_; + + chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'fullscreen-fromhere')); + + my %newsettings = %$settings; + $newsettings{'fullscreen'} = 1; + $newsettings{'start'} = $start; + + $r->print("

    "); + Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); + $r->print("

    \n"); +} 1;