git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
====
[plcapi.git]
/
PLC
/
KeyTypes.py
diff --git
a/PLC/KeyTypes.py
b/PLC/KeyTypes.py
index
7145020
..
df15643
100644
(file)
--- a/
PLC/KeyTypes.py
+++ b/
PLC/KeyTypes.py
@@
-4,8
+4,6
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: KeyTypes.py,v 1.1 2006/10/10 22:09:31 mlhuang Exp $
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
from PLC.Faults import *
from PLC.Parameter import Parameter
@@
-25,34
+23,29
@@
class KeyType(Row):
}
def validate_key_type(self, name):
}
def validate_key_type(self, name):
- # Remove leading and trailing spaces
- name = name.strip()
-
- # Make sure name is not blank after we removed the spaces
- if not name:
+ # Make sure name is not blank
+ if not len(name):
raise PLCInvalidArgument, "Key type must be specified"
raise PLCInvalidArgument, "Key type must be specified"
-
- # Make sure key type does not alredy exist
- conflicts = KeyTypes(self.api, [name])
+
+
# Make sure key type does not alredy exist
+
conflicts = KeyTypes(self.api, [name])
if conflicts:
raise PLCInvalidArgument, "Key type name already in use"
if conflicts:
raise PLCInvalidArgument, "Key type name already in use"
- return name
-
+
return name
+
class KeyTypes(Table):
"""
Representation of the key_types table in the database.
"""
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)
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)