my $apr = Apache2::Request->new($r);
my $dbh = Sesse::pr0n::Common::get_dbh();
- my ($event, $abspath, $evselect);
+ my ($event, $abspath, $datesort);
if ($r->uri =~ /^\/\+all\/?/) {
$event = '+all';
$abspath = 1;
- $evselect = '';
+
+ # 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;
- $evselect = 'event=' . $dbh->quote($event) . ' AND ';
+ $datesort = 'ASC';
}
# Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/
rot => 0,
sel => 0,
fullscreen => 0,
+ model => undef,
+ lens => undef
);
+ my $where;
+ if ($event eq '+all') {
+ $where = '';
+ } else {
+ $where = ' AND event=' . $dbh->quote($event);
+ }
+
# Any NEF files => default to processing
- my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE $evselect vhost=? AND LOWER(filename) LIKE '%.nef' LIMIT 1",
+ my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND LOWER(filename) LIKE '%.nef' LIMIT 1",
undef, $r->get_server_name)
and $defsettings{'xres'} = $defsettings{'yres'} = undef;
my %settings = %defsettings;
- for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen) {
+ for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens) {
my $val = $apr->param($s);
if (defined($val) && $val =~ /^(\d+)$/) {
$settings{$s} = $val;
if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) {
$settings{$s} = $val;
}
+ if ($s eq "model" || $s eq "lens") {
+ $val =~ s/_/ /g;
+ $settings{$s} = $val;
+ }
}
my $thumbxres = $settings{'thumbxres'};
my $infobox = $settings{'infobox'} ? '' : 'nobox/';
my $rot = $settings{'rot'};
my $sel = $settings{'sel'};
+ my $model = $settings{'model'};
+ my $lens = $settings{'lens'};
+
+ # Construct SQL for this filter
+ if ($all == 0) {
+ $where .= ' AND selected=\'t\'';
+ }
+ if (defined($model) && defined($lens)) {
+ my $mq = $dbh->quote($model);
+ my $lq = $dbh->quote($lens);
+
+ if ($model eq '') {
+ # no defined model
+ $where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE tag='Model' AND TRIM(value)<>'' )";
+ } else {
+ $where .= " AND id IN ( SELECT image FROM exif_info WHERE tag='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)<>'' )";
+ } else {
+ $where .= " AND id IN ( SELECT image FROM exif_info WHERE (tag='Lens' OR tag='LensSpec') AND TRIM(value)=$lq )";
+ }
+ }
if (defined($num) && $num == -1) {
$num = undef;
$name = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title');
$r->set_last_modified($ref->{'last_update'});
} else {
- $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE $evselect vhost=?",
- undef, $r->get_server_name)
+ $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE vhost=? AND event=?",
+ undef, $r->get_server_name, $event)
or error($r, "Could not find event $event", 404, "File not found");
$date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
}
# Count the number of selected images.
- $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE $evselect vhost=? AND selected=\'t\'", undef, $r->get_server_name);
+ $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE vhost=? $where AND selected=\'t\'", undef, $r->get_server_name);
my $num_selected = $ref->{'num_selected'};
# Find all images related to this event.
- my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
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 $evselect 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");
$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;
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]");
print_infobox($r, $event, \%settings, \%defsettings);
print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0);
print_fullscreen($r, $event, \%settings, \%defsettings);
- print_nextprev($r, $event, $evselect, \%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 $evselect 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
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");
$r->print(" </p>\n");
}
- print_nextprev($r, $event, $evselect, \%settings, \%defsettings);
+ print_nextprev($r, $event, $where, \%settings, \%defsettings);
Sesse::pr0n::Common::footer($r);
}
}
sub print_nextprev {
- my ($r, $event, $evselect, $settings, $defsettings) = @_;
+ my ($r, $event, $where, $settings, $defsettings) = @_;
my $start = $settings->{'start'};
my $num = $settings->{'num'};
- my $all = $settings->{'all'};
my $dbh = Sesse::pr0n::Common::get_dbh();
- my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
$num = undef if (defined($num) && $num == -1);
return unless (defined($start) && defined($num));
# determine total number
- my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE $evselect vhost=? $where",
+ my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE vhost=? $where",
undef, $r->get_server_name)
or dberror($r, "image enumeration");
my $num_images = $ref->{'num_images'};
projects / pr0n / blobdiff