X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FEventObjects.py;h=6dc45731713deb1674e17920208391209ed9f736;hb=4facb0674ab3f9e2deac6e92717b71cbd05f3c10;hp=8f579146e8a687da4c83457d33bdefadd26ed6bf;hpb=7948edcfb0ea02ec1470ae09f4f7b7be2217ca75;p=plcapi.git

diff --git a/PLC/EventObjects.py b/PLC/EventObjects.py
index 8f57914..6dc4573 100644
--- a/PLC/EventObjects.py
+++ b/PLC/EventObjects.py
@@ -4,8 +4,6 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Events.py,v 1.11 2007/01/19 17:50:46 tmack Exp $
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
@@ -15,40 +13,44 @@ from PLC.Table import Row, Table
 
 class EventObject(Row):
     """
-    Representation of a row in the event_object table. 
+    Representation of a row in the event_object table.
     """
-    
+
     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"),
-	'call_name': Parameter(str, "Call responsible for this event"),
-	'call': Parameter(str, "Call responsible for this event, including paramters"),
-	'message': Parameter(str, "High level description of this event"),
+        'call_name': Parameter(str, "Call responsible for this event"),
+        'call': Parameter(str, "Call responsible for this event, including paramters"),
+        'message': Parameter(str, "High level description of this event"),
         'runtime': Parameter(float, "Runtime of event"),
         'time': Parameter(int, "Date and time that the event took place, in seconds since UNIX epoch", ro = True),
         'object_id': Parameter(int, "ID of objects affected by this event"),
-	'object_type': Parameter(str, "What type of object is this event affecting")
-	}    
+        'object_type': Parameter(str, "What type of object is this event affecting")
+        }
 
 class EventObjects(Table):
     """
-    Representation of row(s) from the event_object table in the database. 
+    Representation of row(s) from the event_object table in the database.
     """
 
     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 isinstance(event_filter, (list, tuple, set)):
+            if isinstance(event_filter, (list, tuple, set, int)):
                 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) " % event_filter.sql(api)
-	sql += " AND events.event_id = event_object.event_id " 
-	sql += " ORDER BY %s" % EventObject.primary_key
+                sql += " AND (%s) %s" % event_filter.sql(api, "AND")
+            else:
+                raise PLCInvalidArgument("Wrong event object filter %r"%event_filter)
+
         self.selectall(sql)