search: fix compatibility with Debian wheezy

Specifying the "d:" field only worked for
NumberValueRangeProcessor in older versions of Xapian, such
as the one in Debian wheezy (libsearch-xapian-perl=1.2.10.0-1)

This slipped through since I rarely use wheezy, anymore, and
perhaps nobody else does, either.  Perhaps wheezy support may be
dropped, soon.

Unfortunately, this requires a schema version bump.

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index c8e297f42634a842c3b9b3ba033d21cd71353d9e..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
@@ -221,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);

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 0e499ad16af0a6155dacc0520d54d9cee6489786..86be9ed49811722bd64f667e002a41c18bdf300b 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -117,7 +117,7 @@ sub add_values ($$$) {
                        $smsg->{mime}->body_raw =~ tr!\n!\n!);
 
        my $yyyymmdd = strftime('%Y%m%d', gmtime($ts));
-       $doc->add_value(&PublicInbox::Search::YYYYMMDD, $yyyymmdd);
+       add_val($doc, PublicInbox::Search::YYYYMMDD, $yyyymmdd);
 }
 
 sub index_users ($$) {