Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: I8fec3c2b5843791b6ae61990966e9868b91b4019
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: