X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FIMAPsearchqp.pm;h=0c37220c9dcf3884d1ddd2b096cb03e1b784fc3e;hb=refs%2Fheads%2Fmaster;hp=c9b442cb4fa8dc1d6bd50606e1d93aca5461467f;hpb=bdee1f6bfaa0017877e5d5284c2d5e41f67e847a;p=public-inbox.git
diff --git a/lib/PublicInbox/IMAPsearchqp.pm b/lib/PublicInbox/IMAPsearchqp.pm
index c9b442cb..0c37220c 100644
--- a/lib/PublicInbox/IMAPsearchqp.pm
+++ b/lib/PublicInbox/IMAPsearchqp.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# IMAP search query parser. cf RFC 3501
@@ -16,9 +16,9 @@ my %MM = map {; $MoY[$_-1] => sprintf('%02u', $_) } (1..12);
# IMAP to Xapian header search key mapping
my %IH2X = (
- TEXT => '',
SUBJECT => 's:',
BODY => 'b:',
+ # TEXT => undef, # => everything
FROM => 'f:',
TO => 't:',
CC => 'c:',
@@ -124,7 +124,7 @@ sub ON {
my ($self, $item) = @_;
my $ts = yyyymmdd($item);
my $end = $ts + 86399; # no leap day
- push @{$self->{xap}}, "ts:$ts..$end";
+ push @{$self->{xap}}, "rt:$ts..$end";
my $sql = $self->{sql} or return 1;
$$sql .= " AND ts >= $ts AND ts <= $end";
}
@@ -132,7 +132,7 @@ sub ON {
sub BEFORE {
my ($self, $item) = @_;
my $ts = yyyymmdd($item);
- push @{$self->{xap}}, "ts:..$ts";
+ push @{$self->{xap}}, "rt:..$ts";
my $sql = $self->{sql} or return 1;
$$sql .= " AND ts <= $ts";
}
@@ -140,7 +140,7 @@ sub BEFORE {
sub SINCE {
my ($self, $item) = @_;
my $ts = yyyymmdd($item);
- push @{$self->{xap}}, "ts:$ts..";
+ push @{$self->{xap}}, "rt:$ts..";
my $sql = $self->{sql} or return 1;
$$sql .= " AND ts >= $ts";
}
@@ -162,11 +162,24 @@ sub msn_set {
uid_set($self, $seq_set);
}
+# things that should not match
+sub impossible {
+ my ($self) = @_;
+ push @{$self->{xap}}, 'z:..0';
+ my $sql = $self->{sql} or return 1;
+ $$sql .= ' AND num < 0';
+}
+
my $prd = Parse::RecDescent->new(<<'EOG');
{ my $q = $PublicInbox::IMAPsearchqp::q; }
search_key : CHARSET(?) search_key1(s) { $return = $q }
-search_key1 : "ALL" | "RECENT" | "UNSEEN" | "NEW"
+
+# n.b. we silently ignore most per-message flags right now;
+# they're here for now to not dump parser errors.
+search_key1 : "ALL" | "ANSWERED" | "RECENT" | "UNSEEN" | "SEEN" | "NEW"
+ | "UNANSWERED" | "UNDELETED" | "UNDRAFT" | "UNFLAGGED"
+ | DELETED | DRAFT | FLAGGED | OLD
| OR_search_keys
| NOT_search_key
| LARGER_number
@@ -183,6 +196,8 @@ search_key1 : "ALL" | "RECENT" | "UNSEEN" | "NEW"
| CC_string
| BCC_string
| SUBJECT_string
+ | BODY_string
+ | TEXT_string
| UID_set
| MSN_set
| sub_query
@@ -202,8 +217,14 @@ BEFORE_date : 'BEFORE' date { $q->BEFORE(\%item) }
MSN_set : sequence_set { $q->msn_set($item{sequence_set}) }
UID_set : "UID" sequence_set { $q->uid_set($item{sequence_set}) }
-LARGER_number : "LARGER" number { $q->xap_only("bytes:$item{number}..") }
-SMALLER_number : "SMALLER" number { $q->xap_only("bytes:..$item{number}") }
+LARGER_number : "LARGER" number { $q->xap_only("z:$item{number}..") }
+SMALLER_number : "SMALLER" number { $q->xap_only("z:..$item{number}") }
+
+DELETED : "DELETED" { $q->impossible }
+OLD : "OLD" { $q->impossible }
+FLAGGED : "FLAGGED" { $q->impossible }
+DRAFT : "DRAFT" { $q->impossible }
+
# pass "NOT" through XXX is this right?
OP_NOT : "NOT" { $q->xap_only('NOT') }
NOT_search_key : OP_NOT search_key1
@@ -239,6 +260,8 @@ TO_string : "TO" string { $q->ih2x('TO', $item{string}) }
CC_string : "CC" string { $q->ih2x('CC', $item{string}) }
BCC_string : "BCC" string { $q->ih2x('BCC', $item{string}) }
SUBJECT_string : "SUBJECT" string { $q->ih2x('SUBJECT', $item{string}) }
+BODY_string : "BODY" string { $q->ih2x('BODY', $item{string}) }
+TEXT_string : "TEXT" string { $q->ih2x(undef, $item{string}) }
op_subq_enter : '(' { $q->subq_enter }
sub_query : op_subq_enter search_key1(s) ')' { $q->subq_leave }
@@ -256,6 +279,8 @@ sub parse {
my $sql = '';
%$q = (sql => \$sql, imap => $imap); # imap = PublicInbox::IMAP obj
# $::RD_TRACE = 1;
+ local $::RD_ERRORS = undef;
+ local $::RD_WARN = undef;
my $res = eval { $prd->search_key(uc($query)) };
return $@ if $@ && $@ =~ /\A(?:BAD|NO) /;
return 'BAD unexpected result' if !$res || $res != $q;