# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: PCUs.py,v 1.8 2006/11/08 23:00:00 mlhuang Exp $
+# $Id: PCUs.py 5574 2007-10-25 20:33:17Z thierry $
#
from PLC.Faults import *
database.
"""
- def __init__(self, api, pcu_filter = None):
- Table.__init__(self, api, PCU)
+ def __init__(self, api, pcu_filter = None, columns = None):
+ Table.__init__(self, api, PCU, columns)
sql = "SELECT %s FROM view_pcus WHERE True" % \
- ", ".join(PCU.fields)
+ ", ".join(self.columns)
if pcu_filter is not None:
if isinstance(pcu_filter, (list, tuple, set)):
pcu_filter = Filter(PCU.fields, {'pcu_id': pcu_filter})
elif isinstance(pcu_filter, dict):
pcu_filter = Filter(PCU.fields, pcu_filter)
- sql += " AND (%s)" % pcu_filter.sql(api)
+ sql += " AND (%s) %s" % pcu_filter.sql(api)
self.selectall(sql)