From f4b7fb37983d6b1e9f61d3a6ee41dfe194c0f218 Mon Sep 17 00:00:00 2001 From: "Zhang Rong(Jon)" Date: Fri, 11 Nov 2022 18:48:59 +0800 Subject: [PATCH] Fix regex expression bug Signed-off-by: Zhang Rong(Jon) Change-Id: I8fec3c2b5843791b6ae61990966e9868b91b4019 --- o2common/views/view.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/o2common/views/view.py b/o2common/views/view.py index 2a01005..2b05027 100644 --- 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 - 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: -- 2.16.6