# Tony Mack <tmack@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
+# $Id: EventObjects.py,v 1.4 2007/09/12 17:52:27 tmack Exp $
#
from PLC.Faults import *
table_name = 'event_object'
primary_key = 'event_id'
fields = {
- 'event_object.event_id': Parameter(int, "Event identifier"),
+ 'event_id': Parameter(int, "Event identifier"),
'person_id': Parameter(int, "Identifier of person responsible for event, if any"),
'node_id': Parameter(int, "Identifier of node responsible for event, if any"),
'fault_code': Parameter(int, "Event fault code"),
def __init__(self, api, event_filter = None, columns = None):
Table.__init__(self, api, EventObject, columns)
- sql = "SELECT %s FROM event_object, events WHERE True" % \
+
+ sql = "SELECT %s FROM view_event_objects WHERE True" % \
", ".join(self.columns)
- if event_filter is not None:
+
+ if event_filter is not None:
if isinstance(event_filter, (list, tuple, set)):
event_filter = Filter(EventObject.fields, {'event_id': event_filter})
+ sql += " AND (%s)" % event_filter.sql(api, "OR")
elif isinstance(event_filter, dict):
event_filter = Filter(EventObject.fields, event_filter)
- sql += " AND (%s) " % event_filter.sql(api)
- sql += " AND events.event_id = event_object.event_id "
+ sql += " AND (%s)" % event_filter.sql(api, "AND")
+ elif isinstance (event_filter, int):
+ event_filter = Filter(EventObject.fields, {'event_id':[event_filter]})
+ sql += " AND (%s)" % event_filter.sql(api, "AND")
+ else:
+ raise PLCInvalidArgument, "Wrong event object filter %r"%event_filter
sql += " ORDER BY %s" % EventObject.primary_key
- self.selectall(sql)
+
+ self.selectall(sql)