|
@@ -176,6 +176,7 @@ def build_filter_conditions(data, filters, conditions): |
|
|
if f[2]=='in': |
|
|
if f[2]=='in': |
|
|
opts = ["'" + t.strip().replace("'", "\'") + "'" for t in f[3].split(',')] |
|
|
opts = ["'" + t.strip().replace("'", "\'") + "'" for t in f[3].split(',')] |
|
|
f[3] = "(" + ', '.join(opts) + ")" |
|
|
f[3] = "(" + ', '.join(opts) + ")" |
|
|
|
|
|
conditions.append(tname + '.' + f[1] + " " + f[2] + " " + f[3]) |
|
|
else: |
|
|
else: |
|
|
if isinstance(f[3], basestring): |
|
|
if isinstance(f[3], basestring): |
|
|
f[3] = "'" + f[3].replace("'", "\'") + "'" |
|
|
f[3] = "'" + f[3].replace("'", "\'") + "'" |
|
@@ -183,7 +184,7 @@ def build_filter_conditions(data, filters, conditions): |
|
|
else: |
|
|
else: |
|
|
conditions.append('ifnull(' + tname + '.' + f[1] + ",0) " + f[2] \ |
|
|
conditions.append('ifnull(' + tname + '.' + f[1] + ",0) " + f[2] \ |
|
|
+ " " + cstr(f[3])) |
|
|
+ " " + cstr(f[3])) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def build_match_conditions(data, conditions): |
|
|
def build_match_conditions(data, conditions): |
|
|
"""add match conditions if applicable""" |
|
|
"""add match conditions if applicable""" |
|
|
match_conditions = [] |
|
|
match_conditions = [] |
|
|