X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=PLC%2FConfFiles.py;h=0efeb9e6f010e4568ea9de33503aa034415d5d81;hb=a9a0594771b4cc07da8dcb752e90ba1559ebf445;hp=78853df204380b64db0cf9ea815f1f42d7901dc6;hpb=e347fc823bbba9d88a3fddf07d5c21024dfd1e55;p=plcapi.git

diff --git a/PLC/ConfFiles.py b/PLC/ConfFiles.py
index 78853df..0efeb9e 100644
--- a/PLC/ConfFiles.py
+++ b/PLC/ConfFiles.py
@@ -4,7 +4,8 @@
 # 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 $
+# $Id$
+# $URL$
 #
 
 from PLC.Faults import *
@@ -140,16 +141,16 @@ class ConfFiles(Table):
     """
 
     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, 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)