imap: support isearch and reduce Xapian queries

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 47025891a5b6de057aec99ec46859b839dcc068a..0df31e7f3caae8c9afb884b725eb0ad59dba6e03 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -203,27 +203,33 @@ sub mbox_all_ids {
        PublicInbox::MboxGz::mbox_gz($ctx, \&all_ids_cb, 'all');
 }
 
+sub gone ($$) {
+       my ($ctx, $what) = @_;
+       warn "W: `$ctx->{-inbox}->{inboxdir}' $what went away unexpectedly\n";
+       undef;
+}
+
 sub results_cb {
        my ($ctx) = @_;
-       my $over = $ctx->{-inbox}->over or return;
+       my $over = $ctx->{-inbox}->over or return gone($ctx, 'over');
        while (1) {
                while (defined(my $num = shift(@{$ctx->{ids}}))) {
                        my $smsg = $over->get_art($num) or next;
                        return $smsg;
                }
                # refill result set
-               my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
+               my $srch = $ctx->{-inbox}->isrch or return gone($ctx, 'search');
                my $mset = $srch->mset($ctx->{query}, $ctx->{qopts});
                my $size = $mset->size or return;
                $ctx->{qopts}->{offset} += $size;
-               $ctx->{ids} = $srch->mset_to_artnums($mset);
+               $ctx->{ids} = $srch->mset_to_artnums($mset, $ctx->{qopts});
        }
 }
 
 sub results_thread_cb {
        my ($ctx) = @_;
 
-       my $over = $ctx->{-inbox}->over or return;
+       my $over = $ctx->{-inbox}->over or return gone($ctx, 'over');
        while (1) {
                while (defined(my $num = shift(@{$ctx->{xids}}))) {
                        my $smsg = $over->get_art($num) or next;
@@ -234,11 +240,11 @@ sub results_thread_cb {
                next if $over->expand_thread($ctx);
 
                # refill result set
-               my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
+               my $srch = $ctx->{-inbox}->isrch or return gone($ctx, 'search');
                my $mset = $srch->mset($ctx->{query}, $ctx->{qopts});
                my $size = $mset->size or return;
                $ctx->{qopts}->{offset} += $size;
-               $ctx->{ids} = $srch->mset_to_artnums($mset);
+               $ctx->{ids} = $srch->mset_to_artnums($mset, $ctx->{qopts});
        }
 
 }
@@ -247,7 +253,7 @@ sub mbox_all {
        my ($ctx, $q) = @_;
        my $q_string = $q->{'q'};
        return mbox_all_ids($ctx) if $q_string !~ /\S/;
-       my $srch = $ctx->{-inbox}->search or
+       my $srch = $ctx->{-inbox}->isrch or
                return PublicInbox::WWW::need($ctx, 'Search');
        my $over = $ctx->{-inbox}->over or
                return PublicInbox::WWW::need($ctx, 'Overview');
@@ -259,7 +265,7 @@ sub mbox_all {
                        return [404, [qw(Content-Type text/plain)],
                                ["No results found\n"]];
        $ctx->{query} = $q_string;
-       $ctx->{ids} = $srch->mset_to_artnums($mset);
+       $ctx->{ids} = $srch->mset_to_artnums($mset, $qopts);
        require PublicInbox::MboxGz;
        my $fn;
        if ($q->{t} && $srch->has_threadid) {