Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / EventObjects.py

diff --git a/PLC/EventObjects.py b/PLC/EventObjects.py
index c239ca4..52b44c7 100644 (file)
--- a/PLC/EventObjects.py
+++ b/PLC/EventObjects.py
@@ -4,7 +4,7 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: EventObjects.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from PLC.Faults import *
@@ -21,7 +21,7 @@ class EventObject(Row):
     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"),
@@ -41,14 +41,23 @@ class EventObjects(Table):
 
     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) %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
-        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)