X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FConfFiles.py;h=32a1b54ea6e137c0648c5352a758fbcee8c5422e;hb=2aac8ee7a2d16e89189d4d586b533b42b191ffd6;hp=2244bcfbaca57f16cada80d14838b1402741a9fa;hpb=99a5ef4577d6addbc08a5e04ddab65d3c3f4198f;p=plcapi.git

diff --git a/PLC/ConfFiles.py b/PLC/ConfFiles.py
index 2244bcf..32a1b54 100644
--- 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
 #
-# $Id: ConfFiles.py,v 1.7 2006/11/06 20:48:33 mlhuang Exp $
-#
 
 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.
     """
 
-    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" % \
-              ", ".join(ConfFile.fields)
+              ", ".join(self.columns)
 
         if conf_file_filter is not None:
-            if isinstance(conf_file_filter, list):
+            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)
-            sql += " AND (%s)" % conf_file_filter.sql(api)
+            sql += " AND (%s) %s" % conf_file_filter.sql(api)
 
         self.selectall(sql)