mbox: disable "&t" on existing Xapian until full reindex

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index ef1b9767867c02cee0bdec964d4ca76261cd5077..76428dfbdbc455127161fbc8f76df67c5e7e6308 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -19,10 +19,12 @@ my %rmap_inc;
 sub mbox_results {
        my ($ctx) = @_;
        my $q = PublicInbox::SearchQuery->new($ctx->{qp});
-       my $x = $q->{x};
+       if ($ctx->{env}->{'psgi.input'}->read(my $buf, 3)) {
+               $q->{t} = 1 if $buf =~ /\Ax=[^0]/;
+       }
        require PublicInbox::Mbox;
-       return PublicInbox::Mbox::mbox_all($ctx, $q->{'q'}) if $x eq 'm';
-       sres_top_html($ctx);
+       $q->{x} eq 'm' ? PublicInbox::Mbox::mbox_all($ctx, $q) :
+                       sres_top_html($ctx);
 }
 
 sub sres_top_html {
@@ -46,6 +48,7 @@ sub sres_top_html {
                offset => $o,
                mset => 1,
                relevance => $q->{r},
+               thread => $q->{t},
                asc => $asc,
        };
        my ($mset, $total, $err, $html);
@@ -91,9 +94,8 @@ sub mset_summary {
        my $pfx = ' ' x $pad;
        my $res = \($ctx->{-html_tip});
        my $ibx = $ctx->{-inbox};
-       my $nshard = $ibx->search->{nshard} // 1;
        my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
-       my @nums = map { mdocid($nshard, $_) } $mset->items;
+       my @nums = @{$ibx->search->mset_to_artnums($mset)};
        my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)};
 
        foreach my $m ($mset->items) {
@@ -152,7 +154,7 @@ sub err_txt {
 
 sub search_nav_top {
        my ($mset, $q, $ctx) = @_;
-       my $m = $q->qs_html(x => 'm', r => undef);
+       my $m = $q->qs_html(x => 'm', r => undef, t => undef);
        my $rv = qq{<form\naction="?$m"\nmethod="post"><pre>};
        my $initial_q = $ctx->{-uxs_retried};
        if (defined $initial_q) {
@@ -187,8 +189,19 @@ sub search_nav_top {
        }
        my $A = $q->qs_html(x => 'A', r => undef);
        $rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
-       $rv .= qq{\n\t\t\t\t\t\tdownload: };
-       $rv .= qq{<input\ntype=submit\nvalue="mbox.gz"/></pre></form><pre>};
+       if ($ctx->{-inbox}->search->has_threadid) {
+               $rv .= qq{\n\t\t\tdownload mbox.gz: } .
+                       # we set name=z w/o using it since it seems required for
+                       # lynx (but works fine for w3m).
+                       qq{<input\ntype=submit\nname=z\n} .
+                               q{value="results only"/>} .
+                       qq{|<input\ntype=submit\nname=x\n} .
+                               q{value="full threads"/>};
+       } else { # BOFH needs to --reindex
+               $rv .= qq{\n\t\t\t\t\t\tdownload: } .
+                       qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>}
+       }
+       $rv .= qq{</pre></form><pre>};
 }
 
 sub search_nav_bot {
@@ -316,8 +329,7 @@ sub ctx_prepare {
 
 sub adump {
        my ($cb, $mset, $q, $ctx) = @_;
-       my $nshard = $ctx->{-inbox}->search->{nshard} // 1;
-       $ctx->{ids} = [ map { mdocid($nshard, $_) } $mset->items ];
+       $ctx->{ids} = $ctx->{-inbox}->search->mset_to_artnums($mset);
        $ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
        PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
 }