git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag plcapi-5.4-1
[plcapi.git]
/
PLC
/
ConfFiles.py
diff --git
a/PLC/ConfFiles.py
b/PLC/ConfFiles.py
index
613f03b
..
32a1b54
100644
(file)
--- a/
PLC/ConfFiles.py
+++ b/
PLC/ConfFiles.py
@@
-4,8
+4,6
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: ConfFiles.py,v 1.8 2006/11/08 22:55:29 mlhuang Exp $
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
from PLC.Faults import *
from PLC.Parameter import Parameter
@@
-139,17
+137,17
@@
class ConfFiles(Table):
Representation of the conf_files table in the database.
"""
Representation of the conf_files table in the database.
"""
- def __init__(self, api, conf_file_filter = None):
-
Table.__init__(self, api, ConfFile
)
+ def __init__(self, api, conf_file_filter = None
, columns = None
):
+
Table.__init__(self, api, ConfFile, columns
)
sql = "SELECT %s FROM view_conf_files WHERE True" % \
sql = "SELECT %s FROM view_conf_files WHERE True" % \
- ", ".join(
ConfFile.field
s)
+ ", ".join(
self.column
s)
if conf_file_filter is not None:
if conf_file_filter is not None:
- if isinstance(conf_file_filter, (list, tuple, set)):
+ if isinstance(conf_file_filter, (list, tuple, set
, int, long
)):
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)
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)
self.selectall(sql)