search: index and allow searching by date-time

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index eca2b0f553da802821c25438b143f19e0bfab1bd..34ebd1a6e7d59b02eaa0931fd1c39413d96e0e56 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -9,7 +9,8 @@ use warnings;
 
 # values for searching
 use constant TS => 0;  # Received: header in Unix time
-use constant YYYYMMDD => 1; # for searching in the WWW UI
+use constant YYYYMMDD => 1; # Date: header for searching in the WWW UI
+use constant DT => 2; # Date: YYYYMMDDHHMMSS
 
 use Search::Xapian qw/:standard/;
 use PublicInbox::SearchMsg;
@@ -88,6 +89,9 @@ our @HELP = (
 date range as YYYYMMDD  e.g. d:19931002..20101002
 Open-ended ranges such as d:19931002.. and d:..20101002
 are also supported
+EOF
+       'dt:' => <<EOF,
+date-time range as YYYYMMDDhhmmss (e.g. dt:19931002011000..19931002011200)
 EOF
        'b:' => 'match within message body, including text attachments',
        'nq:' => 'match non-quoted text within message body',
@@ -216,11 +220,14 @@ sub _do_enquire {
 sub _enquire_once {
        my ($self, $query, $opts) = @_;
        my $enquire = enquire($self);
-       $query = Search::Xapian::Query->new(OP_AND,$query);
        $enquire->set_query($query);
        $opts ||= {};
         my $desc = !$opts->{asc};
-       if ($opts->{relevance}) {
+       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 {
                $enquire->set_sort_by_value_then_relevance(TS, $desc);
@@ -255,6 +262,8 @@ sub qp {
        $qp->set_stemming_strategy(STEM_SOME);
        $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);