# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: NetworkMethods.py,v 1.1 2006/10/10 20:23:49 mlhuang Exp $
+# $Id: NetworkMethods.py,v 1.3 2006/10/24 20:02:22 mlhuang Exp $
#
from PLC.Faults import *
}
def validate_method(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, "Network method must be specified"
# Make sure network method does not alredy exist
Representation of the network_methods table in the database.
"""
- def __init__(self, api, names = None):
+ def __init__(self, api, methods = None):
+ Table.__init__(self, api, NetworkMethod)
+
sql = "SELECT %s FROM network_methods" % \
", ".join(NetworkMethod.fields)
- if names:
- # Separate the list into integers and strings
- sql += " WHERE method IN (%s)" % ", ".join(api.db.quote(names))
-
- rows = api.db.selectall(sql)
+ if methods:
+ sql += " WHERE method IN (%s)" % ", ".join(map(api.db.quote, methods))
- for row in rows:
- self[row['method']] = NetworkMethod(api, row)
+ self.selectall(sql)