X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fdomain%2Ffilter.py;fp=o2common%2Fdomain%2Ffilter.py;h=adc7df30f964d5995a0642eb7775761294654398;hb=9cda6dd9bfcf3de766d7be0c42a7ec671f5ac308;hp=a84fdb86c4ea7e0f31f6ffc6e4b1e55a8cc384e7;hpb=8d6c2f135ee103b9a94ea6c29986a608069b6982;p=pti%2Fo2.git diff --git a/o2common/domain/filter.py b/o2common/domain/filter.py index a84fdb8..adc7df3 100644 --- a/o2common/domain/filter.py +++ b/o2common/domain/filter.py @@ -23,23 +23,22 @@ logger = o2logging.get_logger(__name__) def gen_orm_filter(obj: ColumnElement, filter_str: str): + logger.debug(filter_str) if not filter_str: return [] - # filter_without_space = filter_str.replace(" ", "") - filter_without_space = filter_str.strip(' ()') + filter_without_space = filter_str.strip() items = filter_without_space.split(';') filter_list = list() for i in items: - # if '(' in i: - # i = i.replace("(", "") - # if ')' in i: - # i = i.replace(")", "") - filter_expr = i.split(',') + item = i.strip(' ()') + filter_expr = item.split(',') if len(filter_expr) < 3: continue filter_op = filter_expr[0].strip() filter_key = filter_expr[1].strip() + if filter_key == 'objectType': + continue filter_vals = filter_expr[2:] filter_list.extend(toFilterArgs( filter_op, obj, filter_key, filter_vals))