merge from trunk

[plcapi.git] / PLC / EventObjects.py

diff --git a/PLC/EventObjects.py b/PLC/EventObjects.py
index 9ba241a..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: EventObjects.py,v 1.4 2007/09/12 17:52:27 tmack Exp $
+# $Id: EventObjects.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from PLC.Faults import *
@@ -48,15 +48,16 @@ class EventObjects(Table):
        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")
+                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, "AND")
+                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)" % event_filter.sql(api, "AND")
+                sql += " AND (%s) %s" % event_filter.sql(api, "AND")
             else:
                 raise PLCInvalidArgument, "Wrong event object filter %r"%event_filter
-       sql += " ORDER BY %s" % EventObject.primary_key
+# with new filtering, caller needs to set this explicitly
+#      sql += " ORDER BY %s" % EventObject.primary_key
         
        self.selectall(sql)