# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: KeyTypes.py,v 1.2 2006/10/20 17:44:57 mlhuang Exp $
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
}
def validate_key_type(self, name):
- # Make sure name is not blank
+ # Make sure name is not blank
if not len(name):
- raise PLCInvalidArgument, "Key type must be specified"
-
- # Make sure key type does not alredy exist
- conflicts = KeyTypes(self.api, [name])
+ raise PLCInvalidArgument("Key type must be specified")
+
+ # Make sure key type does not alredy exist
+ conflicts = KeyTypes(self.api, [name])
if conflicts:
- raise PLCInvalidArgument, "Key type name already in use"
+ raise PLCInvalidArgument("Key type name already in use")
+
+ return name
- return name
-
class KeyTypes(Table):
"""
Representation of the key_types table in the database.
"""
- def __init__(self, api, names = None):
+ def __init__(self, api, key_types = None):
+ Table.__init__(self, api, KeyType)
+
sql = "SELECT %s FROM key_types" % \
", ".join(KeyType.fields)
-
- if names:
- # Separate the list into integers and strings
- sql += " WHERE key_type IN (%s)" % ", ".join(api.db.quote(names))
- rows = api.db.selectall(sql)
+ if key_types:
+ sql += " WHERE key_type IN (%s)" % ", ".join( [ api.db.quote (t) for t in key_types ] )
- for row in rows:
- self[row['key_type']] = KeyType(api, row)
+ self.selectall(sql)