Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix regex expression bug
[pti/o2.git]
/
o2common
/
views
/
view.py
diff --git
a/o2common/views/view.py
b/o2common/views/view.py
index
2a01005
..
2b05027
100644
(file)
--- a/
o2common/views/view.py
+++ b/
o2common/views/view.py
@@
-44,8
+44,8
@@
def gen_filter(obj: ColumnElement, filter_str: str):
def check_filter(obj: ColumnElement, filter_str: str):
if not filter_str:
return
def check_filter(obj: ColumnElement, filter_str: str):
if not filter_str:
return
- pattern = r'^(\((eq|neq|gt|lt|gte|lte){1},\w+,[\w -]+\)\;?|' +\
- r'\((in|nin|cont|ncont){1},\w*(,[\w -]*)*\)\;?)+'
+ pattern = r'^(\((eq|neq|gt|lt|gte|lte){1},\w+,[\w -
\.
]+\)\;?|' +\
+ r'\((in|nin|cont|ncont){1},\w*(,[\w -
\.
]*)*\)\;?)+'
result = re.match(pattern, filter_str)
logger.warning('filter: {} match result is {}'.format(filter_str, result))
if not result:
result = re.match(pattern, filter_str)
logger.warning('filter: {} match result is {}'.format(filter_str, result))
if not result: