From 45e0296f718b2c15594bd881b466a7993f7fb094 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Tue, 16 Jan 2007 16:55:21 +0000 Subject: [PATCH] - fix to support Filter --- PLC/Messages.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/PLC/Messages.py b/PLC/Messages.py index fd8f045..250ff12 100644 --- a/PLC/Messages.py +++ b/PLC/Messages.py @@ -4,11 +4,12 @@ # Tony Mack # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: Messages.py,v 1.3 2006/11/10 17:06:35 mlhuang Exp $ +# $Id: Messages.py,v 1.4 2006/11/16 17:03:36 mlhuang Exp $ # from PLC.Parameter import Parameter from PLC.Table import Row, Table +from PLC.Filter import Filter class Message(Row): """ @@ -29,16 +30,21 @@ class Messages(Table): Representation of row(s) from the messages table in the database. """ - def __init__(self, api, message_ids, enabled = None): - Table.__init__(self, api, Message) + def __init__(self, api, message_filter = None, columns = None, enabled = None): + Table.__init__(self, api, Message, columns) sql = "SELECT %s from messages WHERE True" % \ - ", ".join(Message.fields) - - if message_ids: - sql += " AND message_id IN (%s)" % ", ".join(map(api.db.quote, message_ids)) + ", ".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)): + message_filter = Filter(Message.fields, {'message_id': message_filter}) + sql += " AND (%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") + self.selectall(sql) -- 2.43.0