Ticket #607: 0001-Add-support-for-2-and-3-arg-versions-of-StringValueR.patch

search-xapian/XS/StringValueRangeProcessor.xs

@@ -3 +3 @@
 PROTOTYPES: ENABLE
 
 StringValueRangeProcessor *
-StringValueRangeProcessor::new(valueno valno)
+StringValueRangeProcessor::new(valno, str="", prefix = TRUE)
+    valueno valno
+    string str
+    bool prefix
     CODE:
-        RETVAL = new StringValueRangeProcessor(valno);
+        switch (items) { /* items includes the hidden this pointer */
+        case 2:
+            RETVAL = new StringValueRangeProcessor(valno);
+            break;
+        case 3:
+        case 4: {
+            RETVAL = new StringValueRangeProcessor(valno, str, prefix);
+            break;
+        }
+        default:
+            croak("Bad parameter count for new");
+        }
     OUTPUT:
         RETVAL
 

search-xapian/t/parser.t

@@ -6 +6 @@
 
 use Test;
 use Devel::Peek;
-BEGIN { plan tests => 58 };
+BEGIN { plan tests => 60 };
 use Search::Xapian qw(:standard);
 ok(1); # If we made it this far, we're ok.
 
@@ -85 +85 @@
 my $vrp3 = new Search::Xapian::StringValueRangeProcessor(3);
 my $vrp4 = new Search::Xapian::NumberValueRangeProcessor(4, '$');
 my $vrp5 = new Search::Xapian::NumberValueRangeProcessor(5, 'kg', 0);
+my $vrp6 = new Search::Xapian::StringValueRangeProcessor(6, 'country:');
+my $vrp7 = new Search::Xapian::StringValueRangeProcessor(7, ':name', 0);
 $qp->add_valuerangeprocessor( $vrp1 );
 $qp->add_valuerangeprocessor( $vrp2 );
 $qp->add_valuerangeprocessor( $vrp4 );
 $qp->add_valuerangeprocessor( $vrp5 );
+$qp->add_valuerangeprocessor( $vrp6 );
+$qp->add_valuerangeprocessor( $vrp7 );
 $qp->add_valuerangeprocessor( $vrp3 );
 
 $qp->add_boolean_prefix("test", "XTEST");
@@ -108 +112 @@
     [ '12/03/99..12/04/01', 'VALUE_RANGE 1 19990312 20010412' ],
     [ '03-12-99..04-14-01', 'VALUE_RANGE 1 19990312 20010414' ],
     [ '(test:a..test:b hello)', '(hello:(pos=1) FILTER VALUE_RANGE 3 test:a test:b)' ],
+    [ 'country:chile..denmark', 'VALUE_RANGE 6 chile denmark' ],
+    [ 'albert..xeni:name', 'VALUE_RANGE 7 albert xeni' ],
     ) {
     my ($str, $res) = @{$pair};
     my $query = $qp->parse_query($str);

xapian-core/docs/valueranges.rst

@@ -60 +60 @@
 The ``VALUE_RANGE`` subquery will only match documents where value 4 is
 >= asimov and <= bradbury (using a string comparison).
 
+``StringValueRangeProcessor`` also supports supplying a prefix or
+suffix, so the user is able to filter queries to a range within a
+specified value:
+
+    prose country:chile..denmark
+
+This is done by providing the string to ``StringValueRangeProcessor``,
+like this:
+
+    Xapian::QueryParser qp;
+    Xapian::StringValueRangeProcessor country_proc(7, "country:", TRUE);
+    qp.add_valuerangeprocessor(&country_proc);
+
+The parsed query will include ``(VALUE_RANGE 7 chile denmark)`` in
+this case.
+
+The last argument determines whether the string is a prefix or a
+suffix (like perhaps a currency indicator: 10..100$).
+
 DateValueRangeProcessor
 =======================