X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=737eba6e7f908a42fa0cd7a57d225297ff919ee2;hb=d4f0d9ec6819c2b84289193021c74c9220d084ed;hp=41b4db1689d1be44e5fadb64c416beb5e78d533c;hpb=b9c62b0e96eb2b04cf0f4355174831606f982f18;p=pr0n

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 41b4db1..737eba6 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -86,8 +86,8 @@ sub handler {
 		undef, $event, $r->get_server_name)
 		or error($r, "Could not find event $event", 404, "File not found");
 
-	my $name = $ref->{'name'};
-	my $date = $ref->{'date'};
+	my $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
+	my $name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'}));
 	$r->set_last_modified($ref->{'last_update'});
 		                
 	# If the client can use cache, do so
@@ -152,6 +152,57 @@ sub handler {
 		print_nextprev($r, $event, \%settings, \%defsettings);
 		print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0);
 		print_fullscreen($r, $event, \%settings, \%defsettings);
+		
+		# Find the equipment used
+		my $eq = $dbh->prepare('
+			SELECT 
+				model.value AS model,
+				coalesce(lens_spec.value, 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)
+			or die "Couldn't find equipment: $!";
+
+		my @equipment = ();
+		my %cameras_seen = ();
+		while (my $ref = $eq->fetchrow_hashref) {
+			if (!defined($ref->{'lens'}) && exists($cameras_seen{$ref->{'model'}})) {
+				#
+				# 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 combine entries without a lens with the previous one.
+				#
+				$equipment[$#equipment]->{'num'} += $ref->{'num'};
+				next;
+			}
+			push @equipment, $ref;
+			$cameras_seen{$ref->{'model'}} = 1;
+		}
+		$eq->finish;
+
+		if (scalar @equipment > 0) {
+			Sesse::pr0n::Templates::print_template($r, "equipment-start");
+			for my $e (@equipment) {
+				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 {
+					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 = "";