diff options
| author | Eric Wong <e@yhbt.net> | 2020-06-16 07:04:26 +0000 |
|---|---|---|
| committer | Eric Wong <e@yhbt.net> | 2020-06-16 21:41:58 +0000 |
| commit | bdee1f6bfaa0017877e5d5284c2d5e41f67e847a (patch) | |
| tree | 14233ad3a517acb774418b80afa36a861561da37 /lib/PublicInbox/IMAPsearchqp.pm | |
| parent | 07caa8528db2ac22d81a0763e1cefd59acd827f1 (diff) | |
| download | public-inbox-bdee1f6bfaa0017877e5d5284c2d5e41f67e847a.tar.gz | |
We no longer pass an arrayref to search_common() or parse_query(), so handle the CHARSET directive in the Parse::RecDescent-generated parser directly.
Diffstat (limited to 'lib/PublicInbox/IMAPsearchqp.pm')
| -rw-r--r-- | lib/PublicInbox/IMAPsearchqp.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/PublicInbox/IMAPsearchqp.pm b/lib/PublicInbox/IMAPsearchqp.pm index fba3bacc..c9b442cb 100644 --- a/lib/PublicInbox/IMAPsearchqp.pm +++ b/lib/PublicInbox/IMAPsearchqp.pm @@ -165,7 +165,7 @@ sub msn_set { my $prd = Parse::RecDescent->new(<<'EOG'); <nocheck> { my $q = $PublicInbox::IMAPsearchqp::q; } -search_key : search_key1(s) { $return = $q } +search_key : CHARSET(?) search_key1(s) { $return = $q } search_key1 : "ALL" | "RECENT" | "UNSEEN" | "NEW" | OR_search_keys | NOT_search_key @@ -188,6 +188,10 @@ search_key1 : "ALL" | "RECENT" | "UNSEEN" | "NEW" | sub_query | <error> +charset : /\S+/ +CHARSET : 'CHARSET' charset +{ $item{charset} =~ /\A(?:UTF-8|US-ASCII)\z/ ? 1 : die('NO [BADCHARSET]'); } + SENTSINCE_date : 'SENTSINCE' date { $q->SENTSINCE(\%item) } SENTON_date : 'SENTON' date { $q->SENTON(\%item) } SENTBEFORE_date : 'SENTBEFORE' date { $q->SENTBEFORE(\%item) } @@ -253,7 +257,7 @@ sub parse { %$q = (sql => \$sql, imap => $imap); # imap = PublicInbox::IMAP obj # $::RD_TRACE = 1; my $res = eval { $prd->search_key(uc($query)) }; - return $@ if $@ && $@ =~ /\ABAD /; + return $@ if $@ && $@ =~ /\A(?:BAD|NO) /; return 'BAD unexpected result' if !$res || $res != $q; if (exists $q->{sql}) { delete $q->{xap}; |