Merge branch 'unsubscribe'

[public-inbox.git] / lib / PublicInbox / SearchView.pm

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index e94a1dffc9c0b412d50dd08626f8a5225213ab5a..2ec7ddf843340568519922a9241fe02f115a3beb 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -11,11 +11,12 @@ use PublicInbox::View;
 use PublicInbox::MID qw(mid2path mid_clean mid_mime);
 use Email::MIME;
 require PublicInbox::Git;
+require PublicInbox::Thread;
 our $LIM = 50;
 
 sub sres_top_html {
        my ($ctx) = @_;
-       my $q = PublicInbox::SearchQuery->new($ctx->{cgi});
+       my $q = PublicInbox::SearchQuery->new($ctx->{qp});
        my $code = 200;
 
        # double the limit for expanded views:
@@ -126,13 +127,13 @@ sub search_nav_bot {
 
        if ($n < $total) {
                my $qs = $q->qs_html(o => $n);
-               $rv .= qq{, <a\nhref="?$qs">next</a>}
+               $rv .= qq{, <a\nhref="?$qs"\nrel=next>next</a>}
        }
        if ($o > 0) {
                $rv .= $n < $total ? '/' : ',      ';
                my $p = $o - $LIM;
                my $qs = $q->qs_html(o => ($p > 0 ? $p : 0));
-               $rv .= qq{<a\nhref="?$qs">prev</a>};
+               $rv .= qq{<a\nhref="?$qs"\nrel=prev>prev</a>};
        }
        $rv;
 }
@@ -151,23 +152,19 @@ sub tdump {
        } ($mset->items);
 
        my @rootset;
-       my $th = PublicInbox::View::thread_results(\@m, 0, $q->{r});
-       if ($q->{r}) {
+       my $th = PublicInbox::Thread->new(@m);
+       $th->thread;
+       if ($q->{r}) { # order by relevance
                $th->order(sub {
                        sort { (eval { $pct{$b->topmost->messageid} } || 0)
                                        <=>
                                (eval { $pct{$a->topmost->messageid} } || 0)
                        } @_;
                });
-               @rootset = $th->rootset;
-       } else {
-               @rootset = sort {
-                       (eval { $b->topmost->message->header('X-PI-TS') } || 0)
-                               <=>
-                       (eval { $a->topmost->message->header('X-PI-TS') } || 0)
-               } $th->rootset;
+       } else { # order by time (default for threaded view)
+               $th->order(*PublicInbox::View::sort_ts);
        }
-
+       @rootset = $th->rootset;
        my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
        my $state = {
                ctx => $ctx,
@@ -179,7 +176,6 @@ sub tdump {
        $ctx->{searchview} = 1;
        tdump_ent($git, $state, $_, 0) for @rootset;
        PublicInbox::View::thread_adj_level($state, 0);
-       Email::Address->purge_cache;
 
        $fh->write(search_nav_bot($mset, $q). "\n\n" .
                        foot($ctx). '</pre></body></html>');
@@ -264,12 +260,13 @@ use warnings;
 use PublicInbox::Hval;
 
 sub new {
-       my ($class, $cgi) = @_;
-       my $r = $cgi->param('r');
+       my ($class, $qp) = @_;
+
+       my $r = $qp->{r};
        bless {
-               q => $cgi->param('q'),
-               x => $cgi->param('x') || '',
-               o => int($cgi->param('o') || 0) || 0,
+               q => $qp->{'q'},
+               x => $qp->{x} || '',
+               o => (($qp->{o} || '0') =~ /(\d+)/),
                r => (defined $r && $r ne '0'),
        }, $class;
 }