Add the equipment list back into +all for now.

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 23b6e1499ef61e83fcad949d4f5d52382464a996..8409c8486d197d78b31fbc79780057ad10a7ca2f 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,14 +184,14 @@ 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 
                                        TRIM(model.value) AS model,
                                        coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens,
                                        COUNT(*) AS num
-                               FROM ( SELECT * FROM images WHERE vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename ) i
+                               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