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
- fix typo
[plcapi.git]
/
PLC
/
KeyTypes.py
diff --git
a/PLC/KeyTypes.py
b/PLC/KeyTypes.py
index
7145020
..
0092bf7
100644
(file)
--- a/
PLC/KeyTypes.py
+++ b/
PLC/KeyTypes.py
@@
-4,7
+4,7
@@
# 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 $
+# $Id: KeyTypes.py,v 1.
3 2006/10/24 20:02:22
mlhuang Exp $
#
from PLC.Faults import *
#
from PLC.Faults import *
@@
-25,11
+25,8
@@
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"
# Make sure key type does not alredy exist
raise PLCInvalidArgument, "Key type must be specified"
# Make sure key type does not alredy exist
@@
-44,15
+41,13
@@
class KeyTypes(Table):
Representation of the key_types table in the database.
"""
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(map(api.db.quote, key_types))
- for row in rows:
- self[row['key_type']] = KeyType(api, row)
+ self.selectall(sql)