- $q = $query->as_href;
- $q =~ s/%20/+/g; # improve URL readability
- my $qp = "?q=$q";
- $qp .= "&o=$o" if $o;
-
- $res .= "Search results ordered by [";
- if ($r) {
- $res .= qq{<a\nhref="$qp">date</a>|<b>relevance</b>};
- } else {
- $qp .= '&r';
- $res .= qq{<b>date</b>|<a\nhref="$qp">relevance</a>};
- }
- $res .= "]\n\n";
-
- my $pad = length("$total");
- my $pfx = ' ' x $pad;
- foreach my $m ($mset->items) {
- my $rank = sprintf("%${pad}d", $m->get_rank + 1);
- my $pct = $m->get_percent;
- my $smsg = $m->get_document;
- $smsg = PublicInbox::SearchMsg->load_doc($smsg);
- my $s = PublicInbox::Hval->new_oneline($smsg->subject);
- my $f = $smsg->from_name;
- $f = PublicInbox::Hval->new_oneline($f)->as_html;
- my $d = strftime('%Y-%m-%d %H:%M', gmtime($smsg->ts));
- my $mid = $smsg->mid;
- $mid = PublicInbox::Hval->new_msgid($mid)->as_href;
- $res .= qq{$rank. <b><a\nhref="$mid/t/#u">}.
- $s->as_html . "</a></b>\n";
- $res .= "$pfx - by $f @ $d UTC [$pct%]\n\n";
+ my $d = $q->qs_html(r => 1);
+ $rv .= qq{<b>date</b>|<a\nhref="?$d">relevance</a>};
+ }
+
+ $rv .= '] view[';
+
+ my $x = $q->{x};
+ if ($x eq '') {
+ my $t = $q->qs_html(x => 't');
+ $rv .= qq{<b>summary</b>|<a\nhref="?$t">threaded</a>}
+ } elsif ($q->{x} eq 't') {
+ my $s = $q->qs_html(x => '');
+ $rv .= qq{<a\nhref="?$s">summary</a>|<b>threaded</b>};
+ }
+ my $A = $q->qs_html(x => 'A', r => undef);
+ $rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
+}
+
+sub search_nav_bot {
+ my ($mset, $q) = @_;
+ my $total = $mset->get_matches_estimated;
+ my $nr = scalar $mset->items;
+ my $o = $q->{o};
+ my $end = $o + $nr;
+ my $beg = $o + 1;
+ my $rv = '</pre><hr><pre id=t>';
+ if ($beg <= $end) {
+ $rv .= "Results $beg-$end of $total";
+ $rv .= ' (estimated)' if $end != $total;
+ } else {
+ $rv .= "No more results, only $total";
+ }
+ my $n = $o + $LIM;
+
+ if ($n < $total) {
+ my $qs = $q->qs_html(o => $n);
+ $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"\nrel=prev>prev</a>};
+ }
+ $rv .= '</pre>';
+}
+
+sub sort_relevance {
+ my ($pct) = @_;
+ sub {
+ [ sort { (eval { $pct->{$b->topmost->{id}} } || 0)
+ <=>
+ (eval { $pct->{$a->topmost->{id}} } || 0)
+ } @{$_[0]} ] };
+}
+
+sub mset_thread {
+ my ($ctx, $mset, $q) = @_;
+ my %pct;
+ my $msgs = $ctx->{srch}->retry_reopen(sub { [ map {
+ my $i = $_;
+ my $smsg = PublicInbox::SearchMsg->load_doc($i->get_document);
+ $pct{$smsg->mid} = $i->get_percent;
+ $smsg;
+ } ($mset->items) ]});
+ my $r = $q->{r};
+ my $rootset = PublicInbox::SearchThread::thread($msgs,
+ $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts);
+ my $skel = search_nav_bot($mset, $q). "<pre>";
+ my $inbox = $ctx->{-inbox};
+ $ctx->{-upfx} = '';
+ $ctx->{anchor_idx} = 1;
+ $ctx->{cur_level} = 0;
+ $ctx->{dst} = \$skel;
+ $ctx->{mapping} = {};
+ $ctx->{pct} = \%pct;
+ $ctx->{prev_attr} = '';
+ $ctx->{prev_level} = 0;
+ $ctx->{seen} = {};
+ $ctx->{s_nr} = scalar(@$msgs).'+ results';
+
+ PublicInbox::View::walk_thread($rootset, $ctx,
+ *PublicInbox::View::pre_thread);
+ @$msgs = reverse @$msgs if $r;
+ my $mime;
+ sub {
+ return unless $msgs;
+ while ($mime = pop @$msgs) {
+ $mime = $inbox->msg_by_smsg($mime) and last;