X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=cb83a9252933dcb9c19dae44de0b13666c835b7b;hb=6cd0332e10bb468ef5506be63b8a47f7c7e12fd9;hp=cd1338631b08e7ce48dc7658416db768a888ded6;hpb=ae34fcee3c7ffe92f3a4dac08d7d6ed0310ad823;p=pr0n
diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index cd13386..cb83a92 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -48,7 +48,6 @@ sub handler {
start => 1,
num => 250,
all => 1,
- infobox => 1,
rot => 0,
sel => 0,
fullscreen => 0,
@@ -64,19 +63,14 @@ sub handler {
$where = ' AND event=' . $dbh->quote($event);
}
- # Any NEF files => default to processing
- my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) LIMIT 1",
+ # Any NEF files with no non-NEF renders => default to processing
+ my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) AND render_id IS NULL LIMIT 1",
undef, Sesse::pr0n::Common::get_server_name($r))
and $defsettings{'xres'} = $defsettings{'yres'} = undef;
- # Reduce the front page load when in overload mode.
- if (Sesse::pr0n::Overload::is_in_overload($r)) {
- $defsettings{'num'} = 100;
- }
-
my %settings = %defsettings;
- for my $s (qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author)) {
+ for my $s (qw(thumbxres thumbyres xres yres start num all rot sel fullscreen model lens author)) {
my $val = $r->param($s);
if (defined($val) && $val =~ /^(\d+)$/) {
$settings{$s} = $val;
@@ -99,7 +93,6 @@ sub handler {
my $start = $settings{'start'};
my $num = $settings{'num'};
my $all = $settings{'all'};
- my $infobox = $settings{'infobox'} ? '' : 'nobox/';
my $rot = $settings{'rot'};
my $sel = $settings{'sel'};
my $model = $settings{'model'};
@@ -129,9 +122,8 @@ sub handler {
}
}
if (defined($author)) {
- my $aq = $dbh->quote($author);
-
- $where .= " AND takenby=$aq";
+ my @authors = split /,/, $author;
+ $where .= " AND takenby IN (" . join(', ', map { $dbh->quote($_) } @authors) . ")";
}
if (defined($num) && $num == -1) {
@@ -163,13 +155,13 @@ sub handler {
# }
# Count the number of selected images.
- $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE vhost=? $where AND selected=\'t\'", undef, Sesse::pr0n::Common::get_server_name($r));
+ $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE vhost=? $where AND selected AND NOT is_render", undef, Sesse::pr0n::Common::get_server_name($r));
my $num_selected = $ref->{'num_selected'};
# 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 $datesort,takenby,date,filename $limit")
+ my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where AND NOT is_render ORDER BY (date - INTERVAL '6 hours')::date $datesort,takenby,date,filename $limit")
or return dberror($r, "prepare()");
$q->execute(Sesse::pr0n::Common::get_server_name($r))
or return dberror($r, "image enumeration");
@@ -207,8 +199,7 @@ sub handler {
Sesse::pr0n::Templates::print_template($r, $io, "fullscreen-footer", {
returnurl => $returnurl,
start => $settings{'start'} - 1,
- sel => $settings{'sel'},
- infobox => $infobox
+ sel => $settings{'sel'}
});
} else {
Sesse::pr0n::Common::header($r, $io, "$name [$event]");
@@ -220,9 +211,6 @@ sub handler {
Sesse::pr0n::Templates::print_template($r, $io, "overloadmode");
}
- print_viewres($r, $io, $event, \%settings, \%defsettings);
- print_pagelimit($r, $io, $event, \%settings, \%defsettings);
- print_infobox($r, $io, $event, \%settings, \%defsettings);
print_selected($r, $io, $event, \%settings, \%defsettings) if ($num_selected > 0);
print_fullscreen($r, $io, $event, \%settings, \%defsettings);
print_nextprev($r, $io, $event, $where, \%settings, \%defsettings);
@@ -236,6 +224,7 @@ sub handler {
COUNT(*) AS num
FROM images
WHERE vhost=? $where
+ AND NOT is_render
GROUP BY 1,2
ORDER BY 1,2")
or die "Couldn't prepare to find equipment: $!";
@@ -351,12 +340,18 @@ sub handler {
$imgsz = " width=\"$width\" height=\"$height\"";
}
+ # Add fullscreen link.
+ my %fssettings = %settings;
+ $fssettings{'fullscreen'} = 1;
+ my $fsquery = Sesse::pr0n::Common::get_query_string(\%fssettings, \%defsettings);
+ $fsquery .= '#' . $img_num;
+
my $filename = $ref->{'filename'};
- my $uri = $infobox . $filename;
+ my $uri = $filename;
if (defined($xres) && defined($yres) && $xres != -1 && $xres != -2) {
- $uri = "${xres}x$yres/$infobox$filename";
+ $uri = "${xres}x$yres/$filename";
} elsif (defined($xres) && $xres == -1) {
- $uri = "original/$infobox$filename";
+ $uri = "original/$filename";
}
my $prefix = "";
@@ -369,7 +364,7 @@ sub handler {
} else {
$io->print(" ");
}
- $io->print("\n");
+ $io->print("
\n");
if ($rot == 1) {
$io->print(" 90 print("
$title:\n"); - - # Get choices - chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage-unlimited')); - my @alternatives = qw(10 50 100 250 500); - push @alternatives, $unlimited; - - for my $num (@alternatives) { - my %newsettings = %$settings; - - if ($num !~ /^\d+$/) { # unlimited - $newsettings{'num'} = -1; - } else { - $newsettings{'num'} = $num; - } - - $io->print(" "); - if (eq_with_undef($settings->{'num'}, $newsettings{'num'})) { - $io->print($num); - } else { - Sesse::pr0n::Common::print_link($io, $num, "/$event/", \%newsettings, $defsettings); - } - $io->print("\n"); - } - $io->print("
\n"); -} - -sub print_infobox { - my ($r, $io, $event, $settings, $defsettings) = @_; - - chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'infobox')); - chomp (my $on = Sesse::pr0n::Templates::fetch_template($r, 'infobox-on')); - chomp (my $off = Sesse::pr0n::Templates::fetch_template($r, 'infobox-off')); - - $io->print("$title:\n"); - - my %newsettings = %$settings; - - if ($settings->{'infobox'} == 1) { - $io->print($on); - } else { - $newsettings{'infobox'} = 1; - Sesse::pr0n::Common::print_link($io, $on, "/$event/", \%newsettings, $defsettings); - } - - $io->print(' '); - - if ($settings->{'infobox'} == 0) { - $io->print($off); - } else { - $newsettings{'infobox'} = 0; - Sesse::pr0n::Common::print_link($io, $off, "/$event/", \%newsettings, $defsettings); - } - - $io->print('
'); -} - sub print_nextprev { my ($r, $io, $event, $where, $settings, $defsettings) = @_; my $start = $settings->{'start'}; @@ -534,7 +455,7 @@ sub print_nextprev { return unless (defined($start) && defined($num)); # determine total number - my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE vhost=? $where", + my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE vhost=? $where AND NOT is_render", undef, Sesse::pr0n::Common::get_server_name($r)) or return dberror($r, "image enumeration"); my $num_images = $ref->{'num_images'};