psgi: ensure /$INBOX/$MESSAGE_ID/T/ endpoint is chronological

We only need to call get_thread beyond 1000 messages for
fetching entire mboxes.  It's probably too much for the HTML
display otherwise.

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 4427ae5d86588056c6d7e9108314e8cfd6dff75f..11b23022ff5ed8270af2f5f70ad0bbf3524c08af 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -130,9 +130,9 @@ sub thread_mbox {
        eval { require IO::Compress::Gzip };
        return sub { need_gzip(@_) } if $@;
        my $mid = $ctx->{mid};
        eval { require IO::Compress::Gzip };
        return sub { need_gzip(@_) } if $@;
        my $mid = $ctx->{mid};

-       my $msgs = $srch->get_thread($mid, 0);
+       my $msgs = $srch->get_thread($mid, {});

        return [404, [qw(Content-Type text/plain)], []] if !@$msgs;
        return [404, [qw(Content-Type text/plain)], []] if !@$msgs;

-       my $prev = $msgs->[-1]->{num};
+       my $prev = $msgs->[-1];

        my $i = 0;
        my $cb = sub {
                while (1) {
        my $i = 0;
        my $cb = sub {
                while (1) {


@@ -142,7 +142,7 @@ sub thread_mbox {
                        # refill result set
                        $msgs = $srch->get_thread($mid, $prev);
                        return unless @$msgs;
                        # refill result set
                        $msgs = $srch->get_thread($mid, $prev);
                        return unless @$msgs;

-                       $prev = $msgs->[-1]->{num};
+                       $prev = $msgs->[-1];

                        $i = 0;
                }
        };
                        $i = 0;
                }
        };

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 309e044af91a1b35907b057750afe930d6a9b081..da0f11e5dfded738323b92a1233a0d827ae447d8 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -93,16 +93,20 @@ ORDER BY num ASC LIMIT 1
 SELECT tid,sid FROM over WHERE num = ? LIMIT 1
 
        defined $tid or return nothing; # $sid may be undef
 SELECT tid,sid FROM over WHERE num = ? LIMIT 1
 
        defined $tid or return nothing; # $sid may be undef

-
-       $prev ||= 0;
-       my $cond = 'FROM over WHERE (tid = ? OR sid = ?) AND num > ?';
-       my $msgs = do_get($self, <<"", {}, $tid, $sid, $prev);
-SELECT * $cond ORDER BY num ASC
+       my $sort_col = 'ds';
+       $num = 0;
+       if ($prev) {
+               $num = $prev->{num} || 0;
+               $sort_col = 'num';
+       }
+       my $cond = '(tid = ? OR sid = ?) AND num > ?';
+       my $msgs = do_get($self, <<"", {}, $tid, $sid, $num);
+SELECT num,ts,ds,ddd FROM over WHERE $cond ORDER BY $sort_col ASC

 
        return $msgs unless wantarray;
 
 
        return $msgs unless wantarray;
 

-       my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $prev);
-SELECT COUNT(num) $cond
+       my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $num);
+SELECT COUNT(num) FROM over WHERE $cond

 
        ($nr, $msgs);
 }
 
        ($nr, $msgs);
 }