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 f28245cb0fdb609af5c087f88f2db052e43d56b2..a5407d1efef8aa7ca9c094465c91ad3c934b692c 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -11,16 +11,21 @@ sub handler {
        my $apr = Apache2::Request->new($r);
        my $dbh = Sesse::pr0n::Common::get_dbh();
 
-       my ($event, $abspath);
+       my ($event, $abspath, $datesort);
        if ($r->uri =~ /^\/\+all\/?/) {
                $event = '+all';
                $abspath = 1;
+
+               # augh, this needs 8.3, so we'll have to fiddle around a bit instead
+               # $datesort = 'DESC NULLS LAST';
+               $datesort = 'DESC';
        } else {
                # Find the event
                $r->uri =~ /^\/([a-zA-Z0-9-]+)\/?$/
                        or error($r, "Could not extract event");
                $event = $1;
                $abspath = 0;
+               $datesort = 'ASC';
        }
 
        # Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/
@@ -132,7 +137,7 @@ sub handler {
        # Find all images related to this event.
        my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : "";
 
-       my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit")
+       my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY COALESCE((date - INTERVAL '6 hours')::date, '1970-01-01') $datesort,takenby,date,filename $limit")
                or dberror($r, "prepare()");
        $q->execute($r->get_server_name)
                or dberror($r, "image enumeration");
@@ -142,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;
@@ -156,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]");
@@ -179,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 
@@ -220,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");