X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FRoles.py;h=415365b1db11f17ebffae93474c602292b5f578d;hb=2d763c5797f31cc782ae63901b1dd3e48ba41173;hp=d85444fe3b508d18b598afb9d2e9e5c1df32b856;hpb=f5cd72e35593c96b9996ab4e49674cccc7525c48;p=plcapi.git

diff --git a/PLC/Roles.py b/PLC/Roles.py
index d85444f..415365b 100644
--- a/PLC/Roles.py
+++ b/PLC/Roles.py
@@ -4,11 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
-from types import StringTypes
 from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Filter import Filter
@@ -22,31 +18,31 @@ class Role(Row):
 
     table_name = 'roles'
     primary_key = 'role_id'
-    join_tables = ['person_role', ('tag_types', 'min_role_id')]
+    join_tables = ['person_role', 'tag_type_role' ]
     fields = {
         'role_id': Parameter(int, "Role identifier"),
         'name': Parameter(str, "Role", max = 100),
         }
 
     def validate_role_id(self, role_id):
-	# Make sure role does not already exist
-	conflicts = Roles(self.api, [role_id])
+        # Make sure role does not already exist
+        conflicts = Roles(self.api, [role_id])
         if conflicts:
-            raise PLCInvalidArgument, "Role ID already in use"
+            raise PLCInvalidArgument("Role ID already in use")
 
         return role_id
 
     def validate_name(self, name):
-	# Make sure name is not blank
+        # Make sure name is not blank
         if not len(name):
-            raise PLCInvalidArgument, "Role must be specified"
-	
-	# Make sure role does not already exist
-	conflicts = Roles(self.api, [name])
+            raise PLCInvalidArgument("Role must be specified")
+
+        # Make sure role does not already exist
+        conflicts = Roles(self.api, [name])
         if conflicts:
-            raise PLCInvalidArgument, "Role name already in use"
+            raise PLCInvalidArgument("Role name already in use")
 
-	return name
+        return name
 
 class Roles(Table):
     """
@@ -58,16 +54,24 @@ class Roles(Table):
 
         sql = "SELECT %s FROM roles WHERE True" % \
               ", ".join(Role.fields)
-        
+
         if role_filter is not None:
             if isinstance(role_filter, (list, tuple, set)):
                 # Separate the list into integers and strings
-                ints = filter(lambda x: isinstance(x, (int, long)), role_filter)
-                strs = filter(lambda x: isinstance(x, StringTypes), role_filter)
+                ints = [x for x in role_filter if isinstance(x, int)]
+                strs = [x for x in role_filter if isinstance(x, str)]
                 role_filter = Filter(Role.fields, {'role_id': ints, 'name': strs})
                 sql += " AND (%s) %s" % role_filter.sql(api, "OR")
             elif isinstance(role_filter, dict):
                 role_filter = Filter(Role.fields, role_filter)
                 sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+            elif isinstance(role_filter, int):
+                role_filter = Filter(Role.fields, {'role_id': role_filter})
+                sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+            elif isinstance(role_filter, str):
+                role_filter = Filter(Role.fields, {'name': role_filter})
+                sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+            else:
+                raise PLCInvalidArgument("Wrong role filter %r"%role_filter)
 
         self.selectall(sql)