Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Messages.py

diff --git a/PLC/Messages.py b/PLC/Messages.py
index 11b7433..0620ac0 100644 (file)
--- a/PLC/Messages.py
+++ b/PLC/Messages.py
@@ -4,11 +4,12 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Messages.py,v 1.4 2006/10/31 21:46:14 mlhuang Exp $
+# $Id: Messages.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from PLC.Parameter import Parameter
 from PLC.Table import Row, Table
+from PLC.Filter import Filter
 
 class Message(Row):
     """
@@ -19,6 +20,7 @@ class Message(Row):
     primary_key = 'message_id'
     fields = {
         'message_id': Parameter(str, "Message identifier"),
+        'subject': Parameter(str, "Message summary", nullok = True),
         'template': Parameter(str, "Message template", nullok = True),
         'enabled': Parameter(bool, "Message is enabled"),
         }
@@ -28,15 +30,21 @@ class Messages(Table):
     Representation of row(s) from the messages table in the database. 
     """
 
-    def __init__(self, api, message_ids, enabled = None):
-        self.api = api
+    def __init__(self, api, message_filter = None, columns = None, enabled = None):
+        Table.__init__(self, api, Message, columns)
     
-        sql = "SELECT %s from messages" % ", ".join(Message.fields)
+        sql = "SELECT %s from messages WHERE True" % \
+              ", ".join(self.columns)
 
         if enabled is not None:
-            sql += " WHERE enabled IS %(enabled)s"
+            sql += " AND enabled IS %s" % enabled
 
-        rows = self.api.db.selectall(sql, locals())
+        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) %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")
 
-        for row in rows:
-            self[row['message_id']] = Message(api, row)
+        self.selectall(sql)