# Find the equipment used
my $eq = $dbh->prepare('
- SELECT DISTINCT
- model.value AS model,
- coalesce(lens_spec.value, lens.value) AS lens
+ SELECT
+ TRIM(model.value) AS model,
+ coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens,
+ COUNT(*) AS num
FROM images 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\'
+ GROUP BY 1,2
ORDER BY 1,2')
or die "Couldn't prepare to find equipment: $!";
$eq->execute($event)
#
# 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;
if (scalar @equipment > 0) {
Sesse::pr0n::Templates::print_template($r, "equipment-start");
for my $e (@equipment) {
- $r->print(" <li>" . $e->{'model'});
- if (defined($e->{'lens'})) {
- $r->print(", " . $e->{'lens'} . "</li>\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("</li>\n");
+ Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} });
}
}
Sesse::pr0n::Templates::print_template($r, "equipment-end");
my $toclose = 0;
my $lastupl = "";
+ my $img_num = $start;
# Print out all thumbnails
if ($rot == 1) {
$r->print(" <form method=\"post\" action=\"/rotate\">\n");
$r->print(" <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-
+
while (my $ref = $q->fetchrow_hashref()) {
my $imgsz = "";
my $takenby = $ref->{'takenby'};
if ($takenby ne $lastupl) {
$lastupl = $takenby;
+ $r->print(" <h2>");
Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+ print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+ $r->print("</h2>\n");
}
if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
my $width = $ref->{'width'};
$ref->{'id'} . "-270\" />\n");
$r->print(" " .
" Del <input type=\"checkbox\" name=\"del-" . $ref->{'id'} . "\" /></p>\n");
+
+ ++$img_num;
}
$r->print(" <input type=\"submit\" value=\"Rotate\" />\n");
$r->print(" </form>\n");
} elsif ($sel == 1) {
$r->print(" <form method=\"post\" action=\"/select\">\n");
$r->print(" <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-
+
while (my $ref = $q->fetchrow_hashref()) {
my $imgsz = "";
my $takenby = $ref->{'takenby'};
if ($takenby ne $lastupl) {
$lastupl = $takenby;
+ $r->print(" <h2>");
Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+ print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+ $r->print("</h2>\n");
}
if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
my $width = $ref->{'width'};
$r->print(" <p><a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
$r->print(" <input type=\"checkbox\" name=\"sel-" .
$ref->{'id'} . "\"$selected /></p>\n");
+
+ ++$img_num;
}
$r->print(" <input type=\"submit\" value=\"Select\" />\n");
$r->print(" </form>\n");
if ($takenby ne $lastupl) {
$r->print(" </p>\n\n") if ($lastupl ne "");
$lastupl = $takenby;
+ $r->print(" <h2>");
Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
- $r->print(" <p>\n");
+ print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+ $r->print("</h2>\n");
+ $r->print(" <p class=\"photos\">\n");
}
if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
my $width = $ref->{'width'};
}
$r->print(" <a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+
+ ++$img_num;
}
$r->print(" </p>\n");
}
Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
$r->print("</p>\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(" <p class=\"fsfromhere\">");
+ Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
+ $r->print("</p>\n");
+}
1;