From eb3a05ae9ed9b635a9378032315d49b0fb5e663a Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 2 Apr 2009 16:57:27 +0000
Subject: [PATCH] fix bugs

---
 cmdline/sfi.py      |  3 ---
 geni/util/record.py | 10 ++++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index 2263b650..f56d37ed 100755
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -390,7 +390,6 @@ def update(opts, args):
    user_cred = get_user_cred()
    rec_file = get_record_file(args[0])
    record = load_record_from_file(rec_file)
-
    if record.get_type() == "user":
        if record.get_name() == user_cred.get_object_gid().get_hrn():
           cred = user_cred
@@ -408,7 +407,6 @@ def update(opts, args):
        cred = get_auth_cred()
    else:
        raise "unknown record type" + record.get_type()
-
    return registry.update(cred, record)
 
 #
@@ -548,7 +546,6 @@ def save_records_to_file(filename, recordList):
 def save_record_to_file(filename, record):
    if not filename.startswith(os.sep):
        filename = sfi_dir + filename
-   print "saving record", record.name, "to file", filename
    str = record.save_to_string()
    file(filename, "w").write(str)
    return
diff --git a/geni/util/record.py b/geni/util/record.py
index 58298423..523b8d51 100644
--- a/geni/util/record.py
+++ b/geni/util/record.py
@@ -5,6 +5,7 @@
 ##
 
 import report
+from types import StringTypes
 from gid import *
 from geni.util.rspec import *
 ##
@@ -75,7 +76,7 @@ class GeniRecord:
     # @param gid is a GID object or the string representation of a GID object
 
     def set_gid(self, gid):
-        if isinstance(gid, str):
+        if isinstance(gid, StringTypes):
             self.gid = gid
         else:
             self.gid = gid.save_to_string(save_parents=True)
@@ -229,7 +230,6 @@ class GeniRecord:
 
     def load_from_dict(self, dict):
         self.set_name(dict['name'])
-
         gidstr = dict.get("gid", None)
         if gidstr:
             self.set_gid(dict['gid'])
@@ -260,10 +260,12 @@ class GeniRecord:
 
     def load_from_string(self, str):
         #dict = xmlrpclib.loads(str)[0][0]
+        
         record = RecordSpec()
         record.parseString(str)
-        dict = record.toDict()
-        self.load_from_dict(dict)
+        record_dict = record.toDict()
+        geni_dict = record_dict['record']
+        self.load_from_dict(geni_dict)
 
     ##
     # Dump the record to stdout
-- 
2.43.0