Setting tag plcapi-5.4-2

[plcapi.git] / PLC / Messages.py

diff --git a/PLC/Messages.py b/PLC/Messages.py
index fd8f045..3696926 100644 (file)
--- a/PLC/Messages.py
+++ b/PLC/Messages.py
@@ -4,17 +4,16 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Messages.py,v 1.3 2006/11/10 17:06:35 mlhuang Exp $
-#
 
 from PLC.Parameter import Parameter
 from PLC.Table import Row, Table
+from PLC.Filter import Filter
 
 class Message(Row):
     """
-    Representation of a row in the messages table. 
+    Representation of a row in the messages table.
     """
-    
+
     table_name = 'messages'
     primary_key = 'message_id'
     fields = {
@@ -23,22 +22,29 @@ class Message(Row):
         'template': Parameter(str, "Message template", nullok = True),
         'enabled': Parameter(bool, "Message is enabled"),
         }
-    
+
 class Messages(Table):
     """
-    Representation of row(s) from the messages table in the database. 
+    Representation of row(s) from the messages table in the database.
     """
 
-    def __init__(self, api, message_ids, enabled = None):
-        Table.__init__(self, api, Message)
-    
-        sql = "SELECT %s from messages WHERE True" % \
-              ", ".join(Message.fields)
+    def __init__(self, api, message_filter = None, columns = None, enabled = None):
+        Table.__init__(self, api, Message, columns)
 
-       if message_ids:
-            sql += " AND message_id IN (%s)" %  ", ".join(map(api.db.quote, message_ids))
+        sql = "SELECT %s from messages WHERE True" % \
+              ", ".join(self.columns)
 
         if enabled is not None:
             sql += " AND enabled IS %s" % enabled
 
+        if message_filter is not None:
+            if isinstance(message_filter, (list, tuple, set, int, long)):
+                message_filter = Filter(Message.fields, {'message_id': message_filter})
+                sql += " AND (%s) %s" % message_filter.sql(api, "OR")
+            elif isinstance(message_filter, dict):
+                message_filter = Filter(Message.fields, message_filter)
+                sql += " AND (%s) %s" % message_filter.sql(api, "AND")
+            else:
+                raise PLCInvalidArgument, "Wrong message filter %r"%message_filter
+
         self.selectall(sql)