Start adding the filter links for the equipment list.

[pr0n] / perl / Sesse / pr0n / Index.pm

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 005c55d9d570b78c3c67f4eefcf7ca2063c20c31..a5407d1efef8aa7ca9c094465c91ad3c934b692c 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -147,7 +147,7 @@ sub handler {
                $r->content_type("text/html; charset=utf-8");
                Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
                while (my $ref = $q->fetchrow_hashref()) {
-                       $r->print("        \"" . $infobox . $ref->{'filename'} . "\",\n");
+                       $r->print("        [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n");
                }
 
                my %settings_no_fullscreen = %settings;
@@ -161,10 +161,10 @@ sub handler {
 
                Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
                        vhost => $r->get_server_name,
-                       event => $event,
                        start => $settings{'start'} - 1,
                        returnurl => $returnurl,
                        sel => $settings{'sel'},
+                       infobox => $infobox
                });
        } else {
                Sesse::pr0n::Common::header($r, "$name [$event]");
@@ -184,7 +184,7 @@ sub handler {
                print_fullscreen($r, $event, \%settings, \%defsettings);
                print_nextprev($r, $event, $where, \%settings, \%defsettings);
        
-               if ($event ne '+all') {
+               if (1 || $event ne '+all') {
                        # Find the equipment used
                        my $eq = $dbh->prepare("
                                SELECT 
@@ -225,11 +225,16 @@ sub handler {
                                        my $eqspec = $e->{'model'};
                                        $eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'}));
 
+                                       my %newsettings = %defsettings;
+                                       $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 });
+                                               Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url });
                                        } else {
-                                               Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} });
+                                               Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url });
                                        }
                                }
                                Sesse::pr0n::Templates::print_template($r, "equipment-end");