Setting tag plcapi-5.4-2

[plcapi.git] / PLC / Events.py

diff --git a/PLC/Events.py b/PLC/Events.py
index ff80efc..cb5d0e2 100644 (file)
--- a/PLC/Events.py
+++ b/PLC/Events.py
@@ -4,8 +4,6 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Events.py,v 1.12 2007/02/27 18:52:14 tmack Exp $
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
@@ -15,25 +13,25 @@ from PLC.Table import Row, Table
 
 class Event(Row):
     """
-    Representation of a row in the events table. 
+    Representation of a row in the events table.
     """
-    
+
     table_name = 'events'
     primary_key = 'event_id'
     fields = {
         '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"),
-       'auth_type': Parameter(int, "Type of auth used. i.e. AuthMethod"),
+        'auth_type': Parameter(int, "Type of auth used. i.e. AuthMethod"),
         '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_ids': Parameter([int], "IDs of objects affected by this event"),
-       'object_types': Parameter([str], "What type of object were affected by this event")
-       }    
+        'object_types': Parameter([str], "What type of object were affected by this event")
+        }
 
     def add_object(self, object_type, object_id, commit = True):
         """
@@ -56,10 +54,10 @@ class Event(Row):
                 self.api.db.commit()
 
             self['object_ids'].append(object_id)
-    
+
 class Events(Table):
     """
-    Representation of row(s) from the events table in the database. 
+    Representation of row(s) from the events table in the database.
     """
 
     def __init__(self, api, event_filter = None, columns = None):
@@ -69,11 +67,11 @@ class Events(Table):
               ", ".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(Event.fields, {'event_id': event_filter})
             elif isinstance(event_filter, dict):
                 event_filter = Filter(Event.fields, event_filter)
+            else:
+                raise PLCInvalidArgument, "Wrong event object filter %r"%event_filter
             sql += " AND (%s) %s" % event_filter.sql(api)
-# with new filtering, caller needs to set this explicitly
-#      sql += " ORDER BY %s" % Event.primary_key
         self.selectall(sql)