X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=4ec1426eeb163fa166b2074b4a112122eefd9d49;hp=ee4c0f967a838c8ef2ea4ed9f84b9dfcaf45a09d;hb=237f1387a5410de5b85f2d9ee564c193ea896bf9;hpb=fa10473159be03eb924e50cdb4688540c78f89b1

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index ee4c0f9..4ec1426 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -11,13 +11,20 @@ sub handler {
 	my $apr = Apache2::Request->new($r);
 	my $dbh = Sesse::pr0n::Common::get_dbh();
 
-	my ($event, $abspath, $datesort);
+	my ($event, $abspath, $datesort, $tag);
 	if ($r->uri =~ /^\/\+all\/?/) {
 		$event = '+all';
 		$abspath = 1;
+		$tag = undef; 
 
 		# augh, this needs 8.3, so we'll have to fiddle around a bit instead
 		# $datesort = 'DESC NULLS LAST';
+		$datesort = 'DESC';
+	} elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) {
+		$tag = $1;
+		$event = "+tags/$tag";
+		$abspath = 1;
+		
 		$datesort = 'DESC';
 	} else {
 		# Find the event
@@ -25,12 +32,13 @@ sub handler {
 			or error($r, "Could not extract event");
 		$event = $1;
 		$abspath = 0;
+		$tag = undef;
 		$datesort = 'ASC';
 	}
 
 	# Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/
-	if ($r->uri !~ m#/$#) {
-		$r->headers_out->{'location'} = "/$event/";
+	if ($r->uri !~ /\/$/) {
+		$r->headers_out->{'location'} = $r->uri . "/";
 		return Apache2::Const::REDIRECT;
 	}
 
@@ -60,7 +68,10 @@ sub handler {
 	);
 	
 	my $where;
-	if ($event eq '+all') {
+	if (defined($tag)) {
+		my $tq = $dbh->quote($tag);
+		$where = " AND id IN ( SELECT image FROM tags WHERE tag=$tq )";
+	} elsif ($event eq '+all') {
 		$where = '';
 	} else {
 		$where = ' AND event=' . $dbh->quote($event);
@@ -87,8 +98,7 @@ sub handler {
 			$settings{$s} = $val;
 		}
 		if ($s eq "model" || $s eq "lens") {
-			$val =~ s/_/ /g;
-			$settings{$s} = $val;
+			$settings{$s} = Sesse::pr0n::Common::pretty_unescape($val);
 		}
 	}
 
@@ -115,17 +125,17 @@ sub handler {
 
 		if ($model eq '') {
 			# no defined model
-			$where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE tag='Model' AND TRIM(value)<>'' )";
+			$where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)<>'' )";
 		} else {
-			$where .= " AND id IN ( SELECT image FROM exif_info WHERE tag='Model' AND TRIM(value)=$mq )";
+			$where .= " AND id IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)=$mq )";
 		}
 	
 		# This doesn't match 1:1 if there's both lens and lensspec, but it should be OK in practice
 		if ($lens eq '') {
 			# no defined lens
-			$where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE (tag='Lens' OR tag='LensSpec') AND TRIM(value)<>'' )";
+			$where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)<>'' )";
 		} else {
-			$where .= " AND id IN ( SELECT image FROM exif_info WHERE (tag='Lens' OR tag='LensSpec') AND TRIM(value)=$lq )";
+			$where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )";
 		}
 	}
 
@@ -135,7 +145,7 @@ sub handler {
 
 	my ($date, $name);
 
-	if ($event eq '+all') {
+	if ($event eq '+all' || defined($tag)) {
 		$ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM events WHERE vhost=?",
 			undef, $r->get_server_name)
 			or error($r, "Could not list events", 404, "File not found");
@@ -172,9 +182,23 @@ sub handler {
 	# Print the page itself
 	if ($settings{'fullscreen'}) {
 		$r->content_type("text/html; charset=utf-8");
-		Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
+
+		if (defined($tag)) {
+			my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag });
+			Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => $title });
+		} else {
+			Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
+		}
+
+		my @files = ();
 		while (my $ref = $q->fetchrow_hashref()) {
-			$r->print("        [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n");
+			push @files, [ $ref->{'event'}, $ref->{'filename'} ];
+		}
+		
+		for my $i (0..$#files) {
+			$r->print("        [ \"" . $files[$i]->[0] . "\", \"" . $files[$i]->[1] . "\" ]");
+			$r->print(",") unless ($i == $#files);
+			$r->print("\n");
 		}
 
 		my %settings_no_fullscreen = %settings;
@@ -194,7 +218,12 @@ sub handler {
 			infobox => $infobox
 		});
 	} else {
-		Sesse::pr0n::Common::header($r, "$name [$event]");
+		if (defined($tag)) {
+			my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag });
+			Sesse::pr0n::Common::header($r, $title);
+		} else {
+			Sesse::pr0n::Common::header($r, "$name [$event]");
+		}
 		if (defined($date)) {
 			Sesse::pr0n::Templates::print_template($r, "date", { date => $date });
 		}
@@ -220,9 +249,9 @@ sub handler {
 					COUNT(*) AS num
 				FROM ( SELECT * FROM images WHERE vhost=? $where ) 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 model.tag='Model'
+					LEFT JOIN ( SELECT * FROM exif_info WHERE key='Lens' ) lens ON i.id=lens.image
+					LEFT JOIN ( SELECT * FROM exif_info WHERE key='LensSpec') lens_spec ON i.id=lens_spec.image
+				WHERE model.key='Model'
 				GROUP BY 1,2
 				ORDER BY 1,2")
 				or die "Couldn't prepare to find equipment: $!";
@@ -251,17 +280,28 @@ sub handler {
 				for my $e (@equipment) {
 					my $eqspec = $e->{'model'};
 					$eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'}));
+					$eqspec = HTML::Entities::encode_entities($eqspec);
 
-					my %newsettings = %defsettings;
-					$newsettings{'model'} = $e->{'model'};
-					$newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : '';
+					my %newsettings = %settings;
+
+					my $action;
+					if (defined($model) && defined($lens)) {
+						chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter"));
+						$newsettings{'model'} = undef;
+						$newsettings{'lens'} = undef;
+					} else {
+						chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter"));
+						$newsettings{'model'} = $e->{'model'};
+						$newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : '';
+					}
+					
 					my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
 
 					# 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, filterurl => $url });
+						Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url, action => $action });
 					} else {
-						Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url });
+						Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url, action => $action });
 					}
 				}
 				Sesse::pr0n::Templates::print_template($r, "equipment-end");