X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPeers.py;h=0973c3d4716905f11e64572f081723ab9b510658;hb=a0e131a2893c75df786c94997370b01cb623dee0;hp=b1de5e7f1384def80ee7ee3530b9e201f566f5aa;hpb=5a4c1b1278ffa01e630fde47f7c54888ed20a576;p=plcapi.git diff --git a/PLC/Peers.py b/PLC/Peers.py index b1de5e7..0973c3d 100644 --- a/PLC/Peers.py +++ b/PLC/Peers.py @@ -227,9 +227,9 @@ class Peers (Table): ints = filter(lambda x: isinstance(x, (int, long)), peer_filter) strs = filter(lambda x: isinstance(x, StringTypes), peer_filter) peer_filter = Filter(Peer.fields, {'peer_id': ints, 'peername': strs}) - sql += " AND (%s)" % peer_filter.sql(api, "OR") + sql += " AND (%s) %s" % peer_filter.sql(api, "OR") elif isinstance(peer_filter, dict): peer_filter = Filter(Peer.fields, peer_filter) - sql += " AND (%s)" % peer_filter.sql(api, "AND") + sql += " AND (%s) %s" % peer_filter.sql(api, "AND") self.selectall(sql)