X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPCUs.py;h=5b69c0aa04a115a2a64498dff427d39eb719cb1a;hb=002a2f5c84731b49c88089a5edbea2935d60c826;hp=e3d929260c6778ff860c282f1130d9d25e471746;hpb=99a5ef4577d6addbc08a5e04ddab65d3c3f4198f;p=plcapi.git

diff --git a/PLC/PCUs.py b/PLC/PCUs.py
index e3d9292..5b69c0a 100644
--- a/PLC/PCUs.py
+++ b/PLC/PCUs.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: PCUs.py,v 1.7 2006/11/02 18:32:55 mlhuang Exp $
+# $Id: PCUs.py,v 1.9 2006/11/09 03:07:42 mlhuang Exp $
 #
 
 from PLC.Faults import *
@@ -100,14 +100,14 @@ class PCUs(Table):
     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):
+            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)