update copyright headers and email addresses

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index eb49f724b3d763017337b689043392c14e588560..2b33b395e6340544fc0fa1ff142e9587f89235e1 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015, all contributors <meta@public-inbox.org>
+# Copyright (C) 2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 # based on notmuch, but with no concept of folders, files or flags
 package PublicInbox::Search;
@@ -28,22 +28,27 @@ use constant {
        # 8 - remove redundant/unneeded document data
        # 9 - disable Message-ID compression
        SCHEMA_VERSION => 9,
+
+       # n.b. FLAG_PURE_NOT is expensive not suitable for a public website
+       # as it could become a denial-of-service vector
        QP_FLAGS => FLAG_PHRASE|FLAG_BOOLEAN|FLAG_LOVEHATE|FLAG_WILDCARD,
 };
 
 # setup prefixes
 my %bool_pfx_internal = (
        type => 'T', # "mail" or "ghost"
-       mid => 'Q', # uniQue id (Message-ID)
+       thread => 'G', # newsGroup (or similar entity - e.g. a web forum name)
 );
 
 my %bool_pfx_external = (
        path => 'XPATH',
-       thread => 'G', # newsGroup (or similar entity - e.g. a web forum name)
+       mid => 'Q', # uniQue id (Message-ID)
 );
 
 my %prob_prefix = (
        subject => 'S',
+       s => 'S', # for mairix compatibility
+       m => 'Q', # 'mid' is exact, 'm' can do partial
 );
 
 my %all_pfx = (%bool_pfx_internal, %bool_pfx_external, %prob_prefix);
@@ -80,7 +85,7 @@ sub query {
        $opts ||= {};
        unless ($query_string eq '') {
                $query = $self->qp->parse_query($query_string, QP_FLAGS);
-               $opts->{relevance} = 1;
+               $opts->{relevance} = 1 unless exists $opts->{relevance};
        }
 
        $self->do_enquire($query, $opts);
@@ -88,8 +93,8 @@ sub query {
 
 sub get_subject_path {
        my ($self, $path, $opts) = @_;
-       my $query = $self->qp->parse_query("path:".mid_compress($path), 0);
-       $self->do_enquire($query, $opts);
+       my $q = Search::Xapian::Query->new(xpfx("path").mid_compress($path));
+       $self->do_enquire($q, $opts);
 }
 
 sub get_thread {
@@ -97,9 +102,9 @@ sub get_thread {
        my $smsg = eval { $self->lookup_message($mid) };
 
        return { total => 0, msgs => [] } unless $smsg;
-       my $qp = $self->qp;
-       my $qtid = $qp->parse_query('thread:'.$smsg->thread_id, 0);
-       my $qsub = $qp->parse_query('path:'.mid_compress($smsg->path), 0);
+       my $qtid = Search::Xapian::Query->new(xpfx('thread').$smsg->thread_id);
+       my $path = mid_compress($smsg->path);
+       my $qsub = Search::Xapian::Query->new(xpfx('path').$path);
        my $query = Search::Xapian::Query->new(OP_OR, $qtid, $qsub);
        $self->do_enquire($query, $opts);
 }
@@ -118,12 +123,13 @@ sub do_enquire {
        if ($opts->{relevance}) {
                $enquire->set_sort_by_relevance_then_value(TS, 1);
        } else {
-               $enquire->set_sort_by_value(TS, 1);
+               $enquire->set_sort_by_value_then_relevance(TS, 1);
        }
        $opts ||= {};
        my $offset = $opts->{offset} || 0;
        my $limit = $opts->{limit} || 50;
        my $mset = $enquire->get_mset($offset, $limit);
+       return $mset if $opts->{mset};
        my @msgs = map {
                PublicInbox::SearchMsg->load_doc($_->get_document);
        } $mset->items;
@@ -263,4 +269,13 @@ sub enquire {
        $self->{enquire} ||= Search::Xapian::Enquire->new($self->{xdb});
 }
 
+sub mid_prefix {
+       my ($self, $mpfx) = @_;
+       my $query = eval { $self->qp->parse_query("m:$mpfx", FLAG_PARTIAL) };
+       return if $@;
+       my $res = $self->do_enquire($query, { relevance => 1 });
+       return unless $res->{total};
+       [ map { $_->mid } @{$res->{msgs}} ];
+}
+
 1;