nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix things related to conditions

Browse source
This commit is contained in:
Romain Bignon 2010-11-01 10:37:07 +01:00
commit 572d5c1061
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
weboob/tools/application/results.py
View file

@ -71,16 +71,16 @@ class ResultsCondition(object):
condition_str = None
def __init__(self, condition_str):
condition_str = condition_str.replace('OR', 'or') \
.replace('AND', 'and') \
.replace('NOT', 'not')
condition_str = condition_str.replace(' OR ', ' or ') \
.replace(' AND ', ' and ') \
.replace(' NOT ', ' not ')
or_list = []
for _or in condition_str.split('or'):
for _or in condition_str.split(' or '):
and_dict = {}
for _and in _or.split('and'):
for _and in _or.split(' and '):
if '!=' in _and:
k, v = _and.split('!=')
k += '!'
k = k.strip() + '!'
elif '=' in _and:
k, v = _and.split('=')
else: