Merge remote-tracking branch 'origin/danga-bundle'

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 34ebd1a6e7d59b02eaa0931fd1c39413d96e0e56..090d998b6c2c3d6fda2365d9ae92ada6f0dd40e6 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -50,6 +50,9 @@ use constant {
 
 my %bool_pfx_external = (
        mid => 'Q', # Message-ID (full/exact), this is mostly uniQue
+       dfpre => 'XDFPRE',
+       dfpost => 'XDFPOST',
+       dfblob => 'XDFPRE XDFPOST',
 );
 
 my $non_quoted_body = 'XNQ XDFN XDFA XDFB XDFHH XDFCTX XDFPRE XDFPOST';
@@ -74,9 +77,6 @@ my %prob_prefix = (
        dfb => 'XDFB',
        dfhh => 'XDFHH',
        dfctx => 'XDFCTX',
-       dfpre => 'XDFPRE',
-       dfpost => 'XDFPOST',
-       dfblob => 'XDFPRE XDFPOST',
 
        # default:
        '' => 'XM S A XQUOT XFN ' . $non_quoted_body,
@@ -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,13 +259,14 @@ 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(
                Search::Xapian::NumberValueRangeProcessor->new(DT, 'dt:'));
 
        while (my ($name, $prefix) = each %bool_pfx_external) {
-               $qp->add_boolean_prefix($name, $prefix);
+               $qp->add_boolean_prefix($name, $_) foreach split(/ /, $prefix);
        }
 
        # we do not actually create AltId objects,
@@ -304,58 +304,14 @@ sub query_ts {
        $self->{over_ro}->query_ts($ts, $prev);
 }
 
-sub first_smsg_by_mid {
-       my ($self, $mid) = @_;
-       my $smsg;
-       retry_reopen($self, sub {
-               each_smsg_by_mid($self, $mid, sub { $smsg = $_[0]; undef });
-       });
-       $smsg;
-}
-
 sub lookup_article {
        my ($self, $num) = @_;
-       my $term = 'XNUM'.$num;
-       my $db = $self->{xdb};
-       retry_reopen($self, sub {
-               my $head = $db->postlist_begin($term);
-               my $tail = $db->postlist_end($term);
-               return if $head->equal($tail);
-               my $doc_id = $head->get_docid;
-               return unless defined $doc_id;
-               $head->inc;
-               if ($head->nequal($tail)) {
-                       warn "article #$num is not unique\n";
-               }
-               # raises on error:
-               my $doc = $db->get_document($doc_id);
-               my $smsg = PublicInbox::SearchMsg->wrap($doc);
-               $smsg->{doc_id} = $doc_id;
-               $smsg->load_expand;
-       });
+       $self->{over_ro}->get_art($num);
 }
 
-sub each_smsg_by_mid {
-       my ($self, $mid, $cb) = @_;
-       # XXX retry_reopen isn't necessary for V2Writable, but the PSGI
-       # interface will need it...
-       my $db = $self->{xdb};
-       my $term = 'Q' . $mid;
-       my $head = $db->postlist_begin($term);
-       my $tail = $db->postlist_end($term);
-       if ($head == $tail) {
-               $db->reopen;
-               $head = $db->postlist_begin($term);
-               $tail = $db->postlist_end($term);
-       }
-       return ($head, $tail, $db) if wantarray;
-       for (; $head->nequal($tail); $head->inc) {
-               my $doc_id = $head->get_docid;
-               my $doc = $db->get_document($doc_id);
-               my $smsg = PublicInbox::SearchMsg->wrap($doc, $mid);
-               $smsg->{doc_id} = $doc_id;
-               $cb->($smsg) or return;
-       }
+sub next_by_mid {
+       my ($self, $mid, $id, $prev) = @_;
+       $self->{over_ro}->next_by_mid($mid, $id, $prev);
 }
 
 # normalize subjects so they are suitable as pathnames for URLs
@@ -377,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