# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: ConfFiles.py,v 1.9 2006/11/09 03:07:42 mlhuang Exp $
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
"""
def __init__(self, api, conf_file_filter = None, columns = None):
- Table.__init__(self, api, ConfFile, columns)
+ Table.__init__(self, api, ConfFile, columns)
sql = "SELECT %s FROM view_conf_files WHERE True" % \
", ".join(self.columns)
if conf_file_filter is not None:
- if isinstance(conf_file_filter, (list, tuple, set)):
+ if isinstance(conf_file_filter, (list, tuple, set, int)):
conf_file_filter = Filter(ConfFile.fields, {'conf_file_id': conf_file_filter})
elif isinstance(conf_file_filter, dict):
conf_file_filter = Filter(ConfFile.fields, conf_file_filter)
- sql += " AND (%s)" % conf_file_filter.sql(api)
+ sql += " AND (%s) %s" % conf_file_filter.sql(api)
self.selectall(sql)