merge from trunk

[plcapi.git] / PLC / Messages.py

diff --git a/PLC/Messages.py b/PLC/Messages.py
index 250ff12..0620ac0 100644 (file)
--- a/PLC/Messages.py
+++ b/PLC/Messages.py
@@ -4,7 +4,7 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Messages.py,v 1.4 2006/11/16 17:03:36 mlhuang Exp $
+# $Id: Messages.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from PLC.Parameter import Parameter
@@ -42,9 +42,9 @@ class Messages(Table):
         if message_filter is not None:
             if isinstance(message_filter, (list, tuple, set)):
                 message_filter = Filter(Message.fields, {'message_id': message_filter})
-                sql += " AND (%s)" % message_filter.sql(api, "OR")
+                sql += " AND (%s) %s" % message_filter.sql(api, "OR")
             elif isinstance(message_filter, dict):
                 message_filter = Filter(Message.fields, message_filter)
-                sql += " AND (%s)" % message_filter.sql(api, "AND")
+                sql += " AND (%s) %s" % message_filter.sql(api, "AND")
 
         self.selectall(sql)