remove Email::Address dependency

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 8283c1aa96f8df604f44b9116fb2ae50eac092d1..0ae050529ca0601da056463b11ab5acece6ccf25 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -11,6 +11,7 @@ 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 {
@@ -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;
 }
@@ -150,36 +151,31 @@ sub tdump {
                $m;
        } ($mset->items);
 
-       require PublicInbox::Thread;
+       my @rootset;
        my $th = PublicInbox::Thread->new(@m);
-       {
-               no warnings 'once';
-               $Mail::Thread::nosubject = 0;
-       }
        $th->thread;
-       if ($q->{r}) {
+       if ($q->{r}) { # order by relevance
                $th->order(sub {
                        sort { (eval { $pct{$b->topmost->messageid} } || 0)
                                        <=>
                                (eval { $pct{$a->topmost->messageid} } || 0)
                        } @_;
                });
-       } else {
-               no warnings 'once';
-               $th->order(*PublicInbox::View::rsort_ts);
+       } 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,
                anchor_idx => 0,
                pct => \%pct,
-               cur_level => 0
+               cur_level => 0,
+               fh => $fh,
        };
        $ctx->{searchview} = 1;
-       tdump_ent($fh, $git, $state, $_, 0) for $th->rootset;
-       PublicInbox::View::thread_adj_level($fh, $state, 0);
-       Email::Address->purge_cache;
+       tdump_ent($git, $state, $_, 0) for @rootset;
+       PublicInbox::View::thread_adj_level($state, 0);
 
        $fh->write(search_nav_bot($mset, $q). "\n\n" .
                        foot($ctx). '</pre></body></html>');
@@ -188,7 +184,7 @@ sub tdump {
 }
 
 sub tdump_ent {
-       my ($fh, $git, $state, $node, $level) = @_;
+       my ($git, $state, $node, $level) = @_;
        return unless $node;
        my $mime = $node->message;
 
@@ -201,16 +197,15 @@ sub tdump_ent {
                };
        }
        if ($mime) {
-               my $end =
-                 PublicInbox::View::thread_adj_level($fh, $state, $level);
-               PublicInbox::View::index_entry($fh, $mime, $level, $state);
-               $fh->write($end) if $end;
+               my $end = PublicInbox::View::thread_adj_level($state, $level);
+               PublicInbox::View::index_entry($mime, $level, $state);
+               $state->{fh}->write($end) if $end;
        } else {
                my $mid = $node->messageid;
-               PublicInbox::View::ghost_flush($fh, $state, '', $mid, $level);
+               PublicInbox::View::ghost_flush($state, '', $mid, $level);
        }
-       tdump_ent($fh, $git, $state, $node->child, $level + 1);
-       tdump_ent($fh, $git, $state, $node->next, $level);
+       tdump_ent($git, $state, $node->child, $level + 1);
+       tdump_ent($git, $state, $node->next, $level);
 }
 
 sub foot {
@@ -267,10 +262,11 @@ use PublicInbox::Hval;
 sub new {
        my ($class, $cgi) = @_;
        my $r = $cgi->param('r');
+       my ($off) = (($cgi->param('o') || '0') =~ /(\d+)/);
        bless {
                q => $cgi->param('q'),
                x => $cgi->param('x') || '',
-               o => int($cgi->param('o') || 0) || 0,
+               o => $off,
                r => (defined $r && $r ne '0'),
        }, $class;
 }