merge from trunk

[plcapi.git] / PLC / Events.py

diff --git a/PLC/Events.py b/PLC/Events.py
index 7eaaed7..0d319cf 100644 (file)
--- a/PLC/Events.py
+++ b/PLC/Events.py
@@ -4,7 +4,7 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Events.py,v 1.13 2007/04/11 20:29:10 tmack Exp $
+# $Id: Events.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from PLC.Faults import *
@@ -73,6 +73,7 @@ class Events(Table):
                 event_filter = Filter(Event.fields, {'event_id': event_filter})
             elif isinstance(event_filter, dict):
                 event_filter = Filter(Event.fields, event_filter)
-            sql += " AND (%s)" % event_filter.sql(api)
-       sql += " ORDER BY %s" % Event.primary_key
+            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)