", ".join(self.columns)
if event_filter is not None:
- if isinstance(event_filter, (list, tuple, set)):
+ if isinstance(event_filter, (list, tuple, set, int, long)):
event_filter = Filter(EventObject.fields, {'event_id': event_filter})
sql += " AND (%s) %s" % event_filter.sql(api, "OR")
elif isinstance(event_filter, dict):
event_filter = Filter(EventObject.fields, event_filter)
sql += " AND (%s) %s" % event_filter.sql(api, "AND")
- elif isinstance (event_filter, int):
- event_filter = Filter(EventObject.fields, {'event_id':[event_filter]})
- sql += " AND (%s) %s" % event_filter.sql(api, "AND")
else:
raise PLCInvalidArgument, "Wrong event object filter %r"%event_filter