X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=0fbd82893b41051d8a944eecbf3228844a899e10;hp=db07bc816a1ee979fbe9d53220bb2289efbcf071;hb=211db32f412b945988bae2a6014ff76017c42282;hpb=e3d1e1f4027546c42411683eeebc7b88da49bdf0

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index db07bc8..0fbd828 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -57,7 +57,7 @@ sub handler {
 		xres => -1,
 		yres => -1,
 		start => 1,
-		num => 100,
+		num => 250,
 		all => 1,
 		infobox => 1,
 		rot => 0,
@@ -127,17 +127,16 @@ sub handler {
 
 		if ($model eq '') {
 			# no defined model
-			$where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)<>'' )";
+			$where .= " AND model IS NULL";
 		} else {
-			$where .= " AND id IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)=$mq )";
+			$where .= " AND model=$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 (key='Lens' OR key='LensSpec') AND TRIM(value)<>'' )";
+			$where .= " AND lens IS NULL";
 		} else {
-			$where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )";
+			$where .= " AND lens=$lq";
 		}
 	}
 	if (defined($author)) {
@@ -199,13 +198,15 @@ sub handler {
 
 		my @files = ();
 		while (my $ref = $q->fetchrow_hashref()) {
-			push @files, [ $ref->{'event'}, $ref->{'filename'} ];
+			my $width = defined($ref->{'width'}) ? $ref->{'width'} : -1;
+			my $height = defined($ref->{'height'}) ? $ref->{'height'} : -1;
+			push @files, [ $ref->{'event'}, $ref->{'filename'}, $width, $height ];
 		}
 		
 		for my $i (0..$#files) {
-			$r->print("        [ \"" . $files[$i]->[0] . "\", \"" . $files[$i]->[1] . "\" ]");
-			$r->print(",") unless ($i == $#files);
-			$r->print("\n");
+			my $line = sprintf "        [ \"%s\", \"%s\", %d, %d ]", @{$files[$i]};
+			$line .= "," unless ($i == $#files);
+			$r->print($line . "\n");
 		}
 
 		my %settings_no_fullscreen = %settings;
@@ -213,14 +214,27 @@ sub handler {
 
 		my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" .
 			Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings);
+		
+		my %settings_bookmark = %settings;
+		$settings_bookmark{'start'} = $defsettings{'start'};
+		my $bookmark_url_base = "http://" . $r->get_server_name . "/" . $event . "/" .
+			Sesse::pr0n::Common::get_query_string(\%settings_bookmark, \%defsettings);
+
+		if ($bookmark_url_base =~ /\?/) {
+			$bookmark_url_base .= ';start=';
+		} else {
+			$bookmark_url_base .= '?start=';
+		}
 
 		# *whistle*
 		$returnurl =~ s/&amp;/&/g;
+		$bookmark_url_base =~ s/&amp;/&/g;
 
 		Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
 			vhost => $r->get_server_name,
 			start => $settings{'start'} - 1,
 			returnurl => $returnurl,
+			bookmarkurlbase => $bookmark_url_base,
 			sel => $settings{'sel'},
 			infobox => $infobox
 		});
@@ -250,15 +264,12 @@ sub handler {
 		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,
+				SELECT
+					model,
+					lens,
 					COUNT(*) AS num
-				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 key='Lens' ) lens ON i.id=lens.image
-					LEFT JOIN ( SELECT * FROM exif_info WHERE key='LensSpec') lens_spec ON i.id=lens_spec.image
-				WHERE model.key='Model'
+				FROM images
+				WHERE vhost=? $where
 				GROUP BY 1,2
 				ORDER BY 1,2")
 				or die "Couldn't prepare to find equipment: $!";
@@ -335,9 +346,11 @@ sub handler {
 				$day = ", " . $ref->{'day'};
 			}
 
-			if ($takenby ne $lastupl) {
+			my $groupkey = $takenby . $day;
+
+			if ($groupkey ne $lastupl) {
 				$r->print("    </p>\n\n") if ($lastupl ne "" && $rot != 1);
-				$lastupl = $takenby;
+				$lastupl = $groupkey;
 
 				my %newsettings = %settings;
 
@@ -355,7 +368,7 @@ sub handler {
 				my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
 				
 				$r->print("    <h2>");
-				Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl, action => $action, filterurl => $url, date => $day });
+				Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $takenby, action => $action, filterurl => $url, date => $day });
 				print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
 				$r->print("</h2>\n");
 
@@ -364,7 +377,7 @@ sub handler {
 				}
 			}
 
-			if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
+			if (defined($ref->{'width'}) && defined($ref->{'height'})) {
 				my $width = $ref->{'width'};
 				my $height = $ref->{'height'};
 					
@@ -478,7 +491,7 @@ sub print_thumbsize {
 }
 sub print_viewres {
 	my ($r, $event, $settings, $defsettings) = @_;
-	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960);
+	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960 1400x1050 1600x1200);
 	chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'viewres-unlimited'));
 	chomp (my $original = Sesse::pr0n::Templates::fetch_template($r, 'viewres-original'));
 	push @alternatives, [ $unlimited, undef, undef ];
@@ -497,7 +510,7 @@ sub print_pagelimit {
 	
 	# Get choices
 	chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage-unlimited'));
-	my @alternatives = qw(10 50 100 500);
+	my @alternatives = qw(10 50 100 250 500);
 	push @alternatives, $unlimited;
 	
 	for my $num (@alternatives) {