remove the site table and site record correctly when deleting sites

diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py
index fa33a04..8a567d7 100644 (file)
--- a/sfa/plc/sfaImport.py
+++ b/sfa/plc/sfaImport.py
@@ -292,10 +292,16 @@ class sfaImport:
             hrn = parent_hrn + "." + node_name
         elif type in ['site'] and 'login_base' in object and object['login_base']:
             site_name = object['login_base']
-            hrn = parent_hrn + "." + site_name         
+            hrn = parent_hrn
+            parent_hrn = get_authority(hrn)
+            type = "authority"
+            # delete the site table
+            site_table = self.get_auth_table(hrn)
+            site_table.drop()
         else:
             return
-
+        
+        # delete the record
         table = self.get_auth_table(parent_hrn)
         record_list = table.resolve(type, hrn)
         if not record_list:

diff --git a/sfa/util/genitable.py b/sfa/util/genitable.py
index 2025fe9..c09ac1a 100644 (file)
--- a/sfa/util/genitable.py
+++ b/sfa/util/genitable.py
@@ -139,6 +139,15 @@ class GeniTable:
             result_rec_list.append(GeniRecord(dict=dict).as_dict())
         return result_rec_list
 
+    def drop(self):
+        try:
+            self.cnx.query('DROP TABLE IF EXISTS ' + self.tablename)
+        except ProgrammingError:
+            try:
+                self.cnx.query('DROP TABLE ' + self.tablename)
+            except ProgrammingError:
+                pass
+    
     @staticmethod
     def geni_records_purge(cninfo):