Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / AddressTypes.py

diff --git a/PLC/AddressTypes.py b/PLC/AddressTypes.py
index 889b79d..7156c00 100644 (file)
--- a/PLC/AddressTypes.py
+++ b/PLC/AddressTypes.py
@@ -4,12 +4,13 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: AddressTypes.py,v 1.4 2006/10/20 17:43:30 mlhuang Exp $
+# $Id: AddressTypes.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from types import StringTypes
 from PLC.Faults import *
 from PLC.Parameter import Parameter
+from PLC.Filter import Filter
 from PLC.Table import Row, Table
 
 class AddressType(Row):
@@ -23,7 +24,7 @@ class AddressType(Row):
     join_tables = ['address_address_type']
     fields = {
         'address_type_id': Parameter(int, "Address type identifier"),
-        'name': Parameter(str, "Address type", max = 20, optional = False),
+        'name': Parameter(str, "Address type", max = 20),
         'description': Parameter(str, "Address type description", max = 254),
         }
 
@@ -45,24 +46,21 @@ class AddressTypes(Table):
     Representation of the address_types table in the database.
     """
 
-    def __init__(self, api, address_type_id_or_name_list = None):
-        sql = "SELECT %s FROM address_types" % \
-              ", ".join(AddressType.fields)
-        
-        if address_type_id_or_name_list:
-            # Separate the list into integers and strings
-            address_type_ids = filter(lambda address_type_id: isinstance(address_type_id, (int, long)),
-                                   address_type_id_or_name_list)
-            names = filter(lambda name: isinstance(name, StringTypes),
-                           address_type_id_or_name_list)
-            sql += " WHERE (False"
-            if address_type_ids:
-                sql += " OR address_type_id IN (%s)" % ", ".join(map(str, address_type_ids))
-            if names:
-                sql += " OR name IN (%s)" % ", ".join(api.db.quote(names))
-            sql += ")"
+    def __init__(self, api, address_type_filter = None, columns = None):
+       Table.__init__(self, api, AddressType, columns)
 
-        rows = api.db.selectall(sql)
+        sql = "SELECT %s FROM address_types WHERE True" % \
+              ", ".join(self.columns)
 
-        for row in rows:
-            self[row['address_type_id']] = AddressType(api, row)
+        if address_type_filter is not None:
+            if isinstance(address_type_filter, (list, tuple, set)):
+                # Separate the list into integers and strings
+                ints = filter(lambda x: isinstance(x, (int, long)), address_type_filter)
+                strs = filter(lambda x: isinstance(x, StringTypes), address_type_filter)
+                address_type_filter = Filter(AddressType.fields, {'address_type_id': ints, 'name': strs})
+                sql += " AND (%s) %s" % address_type_filter.sql(api, "OR")
+            elif isinstance(address_type_filter, dict):
+                address_type_filter = Filter(AddressType.fields, address_type_filter)
+                sql += " AND (%s) %s" % address_type_filter.sql(api, "AND")
+
+        self.selectall(sql)