Make the equipment list mirror the current selection.

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 819d5af71e262f14ca0647d316aa0b745d321f37..681a6652df6acf3772c2b09d693c6f67d7443cc2 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -100,16 +100,11 @@ sub handler {
        my $num_selected = $ref->{'num_selected'};
 
        # Find all images related to this event.
-       my $q;
        my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
+       my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : "";
 
-       if (defined($start) && defined($num) && !$settings{'fullscreen'}) {
-               $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 $num OFFSET " . ($start-1))
-                       or dberror($r, "prepare()");
-       } else {
-               $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")
-                       or dberror($r, "prepare()");
-       }
+       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");
 
@@ -154,18 +149,18 @@ sub handler {
                print_fullscreen($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: $!";