X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FInitScripts.py;fp=PLC%2FInitScripts.py;h=9f864d2a7f97b9c0ad5e7b2ed40f3b6d1ea6cc6f;hb=a0e131a2893c75df786c94997370b01cb623dee0;hp=f425698f6c48294997c2d112f3494a7465c94a23;hpb=5a4c1b1278ffa01e630fde47f7c54888ed20a576;p=plcapi.git diff --git a/PLC/InitScripts.py b/PLC/InitScripts.py index f425698..9f864d2 100644 --- a/PLC/InitScripts.py +++ b/PLC/InitScripts.py @@ -58,9 +58,9 @@ class InitScripts(Table): ints = filter(lambda x: isinstance(x, (int, long)), initscript_filter) strs = filter(lambda x: isinstance(x, StringTypes), initscript_filter) initscript_filter = Filter(InitScript.fields, {'initscript_id': ints, 'name': strs }) - sql += " AND (%s)" % initscript_filter.sql(api, "OR") + sql += " AND (%s) %s" % initscript_filter.sql(api, "OR") elif isinstance(initscript_filter, dict): initscript_filter = Filter(InitScript.fields, initscript_filter) - sql += " AND (%s)" % initscript_filter.sql(api, "AND") + sql += " AND (%s) %s" % initscript_filter.sql(api, "AND") self.selectall(sql)