search: fix compatibility with Debian wheezy

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index f74129d5da1c382fa75dd38f8ca634916349af81..ceee39af88e5f8aefa0f46a9ddfa4b1f96d440ba 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -38,7 +38,8 @@ use constant {
        # 9 - disable Message-ID compression (SHA-1)
        # 10 - optimize doc for NNTP overviews
        # 11 - merge threads when vivifying ghosts
-       SCHEMA_VERSION => 11,
+       # 12 - change YYYYMMDD value column to numeric
+       SCHEMA_VERSION => 12,
 
        # n.b. FLAG_PURE_NOT is expensive not suitable for a public website
        # as it could become a denial-of-service vector
@@ -60,20 +61,23 @@ my %bool_pfx_external = (
 my %prob_prefix = (
        # for mairix compatibility
        s => 'S',
-       m => 'Q', # 'mid' is exact, 'm' can do partial
+       m => 'XMID', # 'mid:' (bool) is exact, 'm:' (prob) can do partial
        f => 'A',
        t => 'XTO',
-       tc => 'XTC',
+       tc => 'XTO XCC',
        c => 'XCC',
-       tcf => 'XTCF',
-       b => 'XBODY',
-       bs => 'XBS',
+       tcf => 'XTO XCC A',
+       b => 'XNQ XQUOT',
+       bs => 'XNQ XQUOT S',
 
        # n.b.: leaving out "a:" alias for "tcf:" even though
        # mairix supports it.  It is only mentioned in passing in mairix(1)
        # and the extra two letters are not significantly longer.
        q => 'XQUOT',
        nq => 'XNQ',
+
+       # default:
+       '' => 'XMID S A XNQ XQUOT',
 );
 
 # not documenting m: and mid: for now, the using the URLs works w/o Xapian
@@ -218,7 +222,7 @@ sub qp {
        $qp->set_stemmer($self->stemmer);
        $qp->set_stemming_strategy(STEM_SOME);
        $qp->add_valuerangeprocessor(
-               Search::Xapian::StringValueRangeProcessor->new(YYYYMMDD, 'd:'));
+               Search::Xapian::NumberValueRangeProcessor->new(YYYYMMDD, 'd:'));
 
        while (my ($name, $prefix) = each %bool_pfx_external) {
                $qp->add_boolean_prefix($name, $prefix);
@@ -241,7 +245,7 @@ EOF
        }
 
        while (my ($name, $prefix) = each %prob_prefix) {
-               $qp->add_prefix($name, $prefix);
+               $qp->add_prefix($name, $_) foreach split(/ /, $prefix);
        }
 
        $self->{query_parser} = $qp;