Fix KeyTypes, Keys

[plcapi.git] / PLC / KeyTypes.py

diff --git a/PLC/KeyTypes.py b/PLC/KeyTypes.py
index 0b0d16e..a3b048b 100644 (file)
--- a/PLC/KeyTypes.py
+++ b/PLC/KeyTypes.py
@@ -4,70 +4,56 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: KeyTypes.py,v 1.1 2006/10/10 20:24:06 mlhuang Exp $
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
-from PLC.Table import Row, Table
+from PLC.Storage.AlchemyObject import AlchemyObj
 
-class KeyType(Row):
+class KeyType(AlchemyObj):
     """
     Representation of a row in the key_types table. To use,
     instantiate with a dict of values.
     """
 
-    table_name = 'key_types'
-    primary_key = 'key_type'
+    tablename = 'key_types'
     fields = {
-        'key_type': Parameter(str, "Key type", max = 20),
+        'key_type': Parameter(str, "Key type", max = 20, primary_key=True),
         }
 
-    def __init__(self, api, fields = {}):
-        Row.__init__(self, fields)
-        self.api = api
-
     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
-       conflicts = KeyTypes(self.api, [name])
+
+        # Make sure key type does not alredy exist
+        conflicts = KeyType().select(filter={'key_type': name})
         if conflicts:
             raise PLCInvalidArgument, "Key type name already in use"
 
-       return name
+        return name
 
-    def delete(self, commit = True):
-        assert 'key_type' in self
+    def sync(self, commit = True, validate=True):
+        AlchemyObj.sync(self, commit=commit, validate=validate)
+        AlchemyObj.insert(self, dict(self))
 
-        # Clean up miscellaneous join tables
-        for table in ['keys', 'key_types']:
-            self.api.db.do("DELETE FROM " + table + \
-                           " WHERE key_type = %(key_type)s",
-                           self)
+    def delete(self, commit=True):
+        """
+        Delete existing key type
+        """
+        assert 'key_type' in self
+        AlchemyObj.delete(self, filter={'key_type': self['key_type']})  
 
-        if commit:
-            self.api.db.commit()
-        
-class KeyTypes(Table):
+class KeyTypes(list):
     """
     Representation of the key_types table in the database.
     """
 
-    def __init__(self, api, names = None):
-        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)
+    def __init__(self, api, key_types = None):
+       if key_types:
+            key_types = KeyType().select(filter={'key_type': key_types})
+        else:
+            key_types = KeyType().select()
 
-        for row in rows:
-            self[row['key_type']] = KeyType(api, row)
+        for key_type in key_types:
+            key_type = KeyType(api, object=key_type)
+            self.append(key_type)