search: avoid repeated mbox results from search

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 7175ddc5a2e06c078ef10f1d7875e3eebd62d709..69eca9fed05a6ea94b0b1ac80d97c0b4d9d78c4b 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -219,14 +219,13 @@ sub _do_enquire {
 
 sub _enquire_once {
        my ($self, $query, $opts) = @_;
-       my $enquire = enquire($self);
+       my $enquire = Search::Xapian::Enquire->new($self->{xdb});
        $enquire->set_query($query);
        $opts ||= {};
         my $desc = !$opts->{asc};
        if (($opts->{mset} || 0) == 2) {
                $enquire->set_docid_order(Search::Xapian::ENQ_ASCENDING());
                $enquire->set_weighting_scheme(Search::Xapian::BoolWeight->new);
-               delete $self->{enquire};
        } elsif ($opts->{relevance}) {
                $enquire->set_sort_by_relevance_then_value(TS, $desc);
        } else {
@@ -260,6 +259,7 @@ sub qp {
        $qp->set_database($self->{xdb});
        $qp->set_stemmer($self->stemmer);
        $qp->set_stemming_strategy(STEM_SOME);
+       $qp->set_max_wildcard_expansion(100);
        $qp->add_valuerangeprocessor(
                Search::Xapian::NumberValueRangeProcessor->new(YYYYMMDD, 'd:'));
        $qp->add_valuerangeprocessor(
@@ -333,11 +333,6 @@ sub subject_normalized {
        $subj;
 }
 
-sub enquire {
-       my ($self) = @_;
-       $self->{enquire} ||= Search::Xapian::Enquire->new($self->{xdb});
-}
-
 sub help {
        my ($self) = @_;
        $self->qp; # parse altids