Merge branch 'master' into exp2

[sfa.git] / sfa / util / record.py

diff --git a/sfa/util/record.py b/sfa/util/record.py
index f9eaa09..8a50a65 100644 (file)
--- a/sfa/util/record.py
+++ b/sfa/util/record.py
@@ -11,10 +11,9 @@ from types import StringTypes
 
 from sfa.trust.gid import *
 
-import sfa.util.report
 from sfa.util.rspec import *
 from sfa.util.parameter import *
-from sfa.util.namespace import *
+from sfa.util.xrn import get_authority
 from sfa.util.row import Row
 
 class SfaRecord(Row):
@@ -208,6 +207,22 @@ class SfaRecord(Row):
         """
         return GID(string=self.gid)
 
+    ##
+    # Returns the value of a field
+
+    def get_field(self, fieldname, default=None):
+        # sometimes records act like classes, and sometimes they act like dicts
+        try:
+            return getattr(self, fieldname)
+        except AttributeError:
+            try:
+                 return self[fieldname]
+            except KeyError:
+                 if default != None:
+                     return default
+                 else:
+                     raise
+
     ##
     # Returns a list of field names in this record. 
 
@@ -355,7 +370,7 @@ class UserRecord(SfaRecord):
         'first_name': Parameter(str, 'First name'),
         'last_name': Parameter(str, 'Last name'),
         'phone': Parameter(str, 'Phone Number'),
-        'key': Parameter(str, 'Public key'),
+        'keys': Parameter(str, 'Public key'),
         'slices': Parameter([str], 'List of slices this user belongs to'),
         }
     fields.update(SfaRecord.fields)