search: replace ->query with ->mset

Nearly all of the search uses in the production code rely on
a Xapian mset iterator being returned (instead of an array
of $smsg objects).  So default to returning the mset and move
the burden of smsg array conversion into the test cases.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 0223bead..47025891 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -213,7 +213,7 @@ sub results_cb {
                 }
                 # refill result set
                 my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
-                my $mset = $srch->query($ctx->{query}, $ctx->{qopts});
+                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);
@@ -235,7 +235,7 @@ sub results_thread_cb {
 
                 # refill result set
                 my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
-                my $mset = $srch->query($ctx->{query}, $ctx->{qopts});
+                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);
@@ -254,7 +254,7 @@ sub mbox_all {
 
         my $qopts = $ctx->{qopts} = { mset => 2 }; # order by docid
         $qopts->{thread} = 1 if $q->{t};
-        my $mset = $srch->query($q_string, $qopts);
+        my $mset = $srch->mset($q_string, $qopts);
         $qopts->{offset} = $mset->size or
                         return [404, [qw(Content-Type text/plain)],
                                 ["No results found\n"]];