Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Search parsing: fix using a parenthesized expression following an implied "and".

Browse Source
This commit is contained in:
Charles Haley 2018-04-29 11:00:37 +02:00
parent 2723d9f2cf
commit c6a6fe07cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/utils/search_query_parser.py
View File

@ -221,8 +221,8 @@ class Parser(object):
return ['and', lhs, self.and_expression()]
# Account for the optional 'and'
if (self.token_type() in [self.WORD, self.QUOTED_WORD] and
self.lcase_token() != 'or'):
if ((self.token_type() in [self.WORD, self.QUOTED_WORD] or self.token() == '(')
and self.lcase_token() != 'or'):
return ['and', lhs, self.and_expression()]
return lhs