# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Roles.py,v 1.4 2006/10/16 21:57:05 mlhuang Exp $
-#
-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 Role(Row):
table_name = 'roles'
primary_key = 'role_id'
- join_tables = ['person_role', ('slice_attribute_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):
- # Remove leading and trailing spaces
- name = name.strip()
+ # Make sure name is not blank
+ if not len(name):
+ raise PLCInvalidArgument("Role must be specified")
- # Make sure name is not blank after we removed the spaces
- if not name:
- raise PLCInvalidArgument, "Role must be specified"
-
- # Make sure role does not already exist
- conflicts = Roles(self.api, [name])
+ # 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):
"""
Representation of the roles table in the database.
"""
- def __init__(self, api, role_id_or_name_list = None):
- sql = "SELECT %s FROM roles" % \
+ def __init__(self, api, role_filter = None):
+ Table.__init__(self, api, Role)
+
+ sql = "SELECT %s FROM roles WHERE True" % \
", ".join(Role.fields)
-
- if role_id_or_name_list:
- # Separate the list into integers and strings
- role_ids = filter(lambda role_id: isinstance(role_id, (int, long)),
- role_id_or_name_list)
- names = filter(lambda name: isinstance(name, StringTypes),
- role_id_or_name_list)
- sql += " WHERE (False"
- if role_ids:
- sql += " OR role_id IN (%s)" % ", ".join(map(str, role_ids))
- if names:
- sql += " OR name IN (%s)" % ", ".join(api.db.quote(names))
- sql += ")"
- rows = api.db.selectall(sql)
+ if role_filter is not None:
+ if isinstance(role_filter, (list, tuple, set)):
+ # Separate the list into integers and strings
+ 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)
- for row in rows:
- self[row['role_id']] = Role(api, row)
+ self.selectall(sql)