X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=e91d9c17b485264f9fd6b3b2acf5a7722513c72f;hb=d2b8ad4b4e6664ae9d5f44276bdf1d4331dc931b;hp=c13b135c61136534f1b3615f40cb44fdfdcde662;hpb=a7c6efeb91f8b8632f6bc37792cd28aa84b9b895;p=pr0n

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index c13b135..e91d9c1 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -103,7 +103,7 @@ sub handler {
 	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 event=? $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 event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit")
 		or dberror($r, "prepare()");
 	$q->execute($event)
 		or dberror($r, "image enumeration");
@@ -144,23 +144,23 @@ sub handler {
 		print_viewres($r, $event, \%settings, \%defsettings);
 		print_pagelimit($r, $event, \%settings, \%defsettings);
 		print_infobox($r, $event, \%settings, \%defsettings);
-		print_nextprev($r, $event, \%settings, \%defsettings);
 		print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0);
 		print_fullscreen($r, $event, \%settings, \%defsettings);
+		print_nextprev($r, $event, \%settings, \%defsettings);
 		
 		# Find the equipment used
-		my $eq = $dbh->prepare('
+		my $eq = $dbh->prepare("
 			SELECT 
 				TRIM(model.value) AS model,
 				coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens,
 				COUNT(*) AS num
-			FROM images i
+			FROM ( SELECT * FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit ) 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
-			WHERE event=? AND model.tag=\'Model\'
+				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
+			WHERE model.tag='Model'
 			GROUP BY 1,2
-			ORDER BY 1,2')
+			ORDER BY 1,2")
 			or die "Couldn't prepare to find equipment: $!";
 		$eq->execute($event)
 			or die "Couldn't find equipment: $!";
@@ -201,7 +201,7 @@ sub handler {
 
 		my $toclose = 0;
 		my $lastupl = "";
-		my $img_num = $start;
+		my $img_num = (defined($start) && defined($num)) ? $start : 1;
 		
 		# Print out all thumbnails
 		if ($rot == 1) {
@@ -433,13 +433,15 @@ sub print_nextprev {
 	my ($r, $event, $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 event=?',
+	my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE event=? $where",
 		undef, $event)
 		or dberror($r, "image enumeration");
 	my $num_images = $ref->{'num_images'};
@@ -451,7 +453,7 @@ sub print_nextprev {
 		$end = $num_images;
 	}
 
-	$r->print("    <p>\n");
+	$r->print("    <p class=\"nextprev\">\n");
 
 	# Previous
 	if ($start > 1) {