create logfile plcapi.log in /var/log and chown it to apache

[plcapi.git] / PLC / Events.py

diff --git a/PLC/Events.py b/PLC/Events.py
index b8ad6e8..cb5d0e2 100644 (file)
--- a/PLC/Events.py
+++ b/PLC/Events.py
@@ -4,9 +4,6 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
@@ -70,9 +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)
         self.selectall(sql)