X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FInitScripts.py;h=028293b6bef1d7b7024c2098f306afb13c47d0f1;hb=9918af35bd1c1a651eefc1b0d398c28b66371092;hp=f425698f6c48294997c2d112f3494a7465c94a23;hpb=dc0227131b094518120478cb6a5917680fcaf4bc;p=plcapi.git diff --git a/PLC/InitScripts.py b/PLC/InitScripts.py index f425698..028293b 100644 --- a/PLC/InitScripts.py +++ b/PLC/InitScripts.py @@ -43,7 +43,7 @@ class InitScript(Row): class InitScripts(Table): """ - Representation of the initscipts table in the database. + Representation of the initscripts table in the database. """ def __init__(self, api, initscript_filter = None, columns = None): @@ -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)