- sql += " AND (%s) " % event_filter.sql(api)
- sql += " AND events.event_id = event_object.event_id "
- sql += " ORDER BY %s" % EventObject.primary_key
- self.selectall(sql)
+ 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
+# with new filtering, caller needs to set this explicitly
+# sql += " ORDER BY %s" % EventObject.primary_key
+
+ self.selectall(sql)