merging bugfixes from trunk

diff --git a/sfa/plc/network.py b/sfa/plc/network.py
index 955036c..94f6e04 100644 (file)
--- a/sfa/plc/network.py
+++ b/sfa/plc/network.py
@@ -115,6 +115,7 @@ class Slice:
         self.network = network
         self.id = slice['slice_id']
         self.name = slice['name']
         self.network = network
         self.id = slice['slice_id']
         self.name = slice['name']

+        self.peer_id = slice['peer_id']

         self.node_ids = set(slice['node_ids'])
         self.slice_tag_ids = slice['slice_tag_ids']
     
         self.node_ids = set(slice['node_ids'])
         self.slice_tag_ids = slice['slice_tag_ids']
     

diff --git a/sfa/util/table.py b/sfa/util/table.py
index bccda20..779562f 100644 (file)
--- a/sfa/util/table.py
+++ b/sfa/util/table.py
@@ -84,6 +84,7 @@ class SfaTable(list):
         self.db.do(querystr)
         for index in indexes:
             self.db.do(index)
         self.db.do(querystr)
         for index in indexes:
             self.db.do(index)

+        self.db.commit()

 
     def remove(self, record):
         query_str = "DELETE FROM %s WHERE record_id = %s" % \
 
     def remove(self, record):
         query_str = "DELETE FROM %s WHERE record_id = %s" % \


@@ -96,6 +97,7 @@ class SfaTable(list):
             sql = " DELETE FROM %s WHERE authority = %s" % \
                     (self.tablename, record['hrn'])
             self.db.do(sql) 
             sql = " DELETE FROM %s WHERE authority = %s" % \
                     (self.tablename, record['hrn'])
             self.db.do(sql) 

+        self.db.commit()

 
     def insert(self, record):
         db_fields = self.db_fields(record)
 
     def insert(self, record):
         db_fields = self.db_fields(record)