X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=5a635d4c190aac8a5fff7e9fc3a05c1ae4aa25b8;hp=f8f44048ff385a6bdfaa3ed5f506b84fcd8d0f7f;hb=6b6a6afa90a6be24ae430324ec5ca7fd83f4fe93;hpb=a5c13b107460a55b50424d6c6bd6a77abf71300d

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index f8f4404..5a635d4 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -155,14 +155,16 @@ sub handler {
 		
 		# 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)
@@ -175,8 +177,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 +190,14 @@ sub handler {
 		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");