Setting tag plcapi-4.3-37

[plcapi.git] / PLC / Events.py

diff --git a/PLC/Events.py b/PLC/Events.py
index 726777c..a237657 100644 (file)
--- a/PLC/Events.py
+++ b/PLC/Events.py
@@ -4,7 +4,8 @@
 # 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 $
+# $Id$
+# $URL$
 #
 
 from PLC.Faults import *
@@ -73,6 +74,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)