X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSFA.py;h=30ef40b687657925259df166ad3220635ddb9dec;hb=d30c6dd87cc81e28adb9a2631638badb9ffa0a41;hp=bd067720a25a00cdb981d9cd721664f969cf9774;hpb=bbb99ba11845f409dbb4f266cad82eeb62131da4;p=plcapi.git

diff --git a/PLC/SFA.py b/PLC/SFA.py
index bd06772..30ef40b 100644
--- a/PLC/SFA.py
+++ b/PLC/SFA.py
@@ -1,32 +1,43 @@
 from types import StringTypes
 import traceback
-from types import StringTypes
-import traceback
+try:
+    from sfa.plc.sfaImport import sfaImport, cleanup_string
+    from sfa.plc.api import GeniAPI
+    from sfa.util.debug import log
+    packages_imported = True  
+except:
+    packages_imported = False
+    traceback.print_exc()
+
+def wrap_exception(method):
+    def wrap(*args, **kwds):
+        try:
+            return method(*args, **kwds)
+        except:
+            traceback.print_exc()
+    return wrap 
 
 class SFA:
     
+    @wrap_exception
     def __init__(self):
-        try:
-            from sfa.plc.sfaImport import sfaImport
-            from sfa.plc.api import GeniAPI
-            from sfa.util.debug import log 
-            self.log = log
-            self.sfa = sfaImport()
-            geniapi = GeniAPI()
-            self.plcapi = geniapi.plshell
-            self.auth = geniapi.plauth
-        except:
-            traceback.print_exc(file = self.log)
-
-        if self.gimport.level1_auth:
-            self.authority = self.gimport.level1_auth
+        self.log = log
+        self.sfa = sfaImport()
+        geniapi = GeniAPI()
+        self.plcapi = geniapi.plshell
+        self.auth = geniapi.plauth
+
+        if self.sfa.level1_auth:
+            self.authority = self.sfa.level1_auth
         else:
-            self.authority = self.gimport.root_auth
+            self.authority = self.sfa.root_auth
 
 
-    def get_login_base(site_id):
+    def get_login_base(self, site_id):
         sites = self.plcapi.GetSites(self.auth, [site_id], ['login_base'])
-        login_base = sites
+        login_base = sites[0]['login_base']
+        return login_base
+        
 
     def get_login_bases(self, object):
         login_bases = []
@@ -46,6 +57,7 @@ class SFA:
 
         return login_bases
 
+    @wrap_exception
     def update_record(self, object, type, login_bases = None):
         try:
             # determine this objects site and login_base
@@ -56,7 +68,7 @@ class SFA:
                 login_bases = [login_bases]
 
             for login_base in login_bases:
-                login_base = self.sfa.cleanup_string(login_base)
+                login_base = cleanup_string(login_base)
                 parent_hrn = self.authority + "." + login_base
                 if type in ['person']:
                     self.sfa.import_person(parent_hrn, object)
@@ -76,21 +88,22 @@ class SFA:
             print >> self.log, "Error importing %s record for %s into geni db: %s" % \
                   (type, id, e.message)
 
+    @wrap_exception
     def delete_record(self, object, type, login_base = None):
-        if not login_bases:
-            login_bases = get_login_bases(object)
+
+        if not login_base:
+            login_bases = self.get_login_bases(object)
+        else:
+            login_bases = [login_base]
 
         for login_base in login_bases:
-            login_base = self.sfa.cleanup_string(login_base)
+            login_base = cleanup_string(login_base)
             parent_hrn = self.authority + "." + login_base
             self.sfa.delete_record(parent_hrn, object, type)
 
     def update_site(self, site, login_base = None):
         self.update_record(site, 'site', login_base)
 
-    def update_site(self, site, login_base = None):
-        self.update_record(site, 'site', login_base)
-
     def update_node(self, node, login_base = None):
         self.update_record(node, 'node', login_base)