From 6629438b2f1a9d54d152281342d4d7e0641b7254 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 27 Oct 2014 12:33:02 +0200 Subject: support node removals in DBO_topo_diff_commit --- src-py/db_controller.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src-py/db_controller.py') diff --git a/src-py/db_controller.py b/src-py/db_controller.py index c73a6882..aa1e8450 100644 --- a/src-py/db_controller.py +++ b/src-py/db_controller.py @@ -124,22 +124,30 @@ class DBO_topo_diff_commit(DB_composed_op): # TODO rm link set # TODO rm node set - assert 0 == len(topo_diff.node_set_rm), 'unsupported' assert 0 == len(topo_diff.link_set_rm), 'unsupported' n_add_map = db_util.meta_attr_list_to_meta_attr_map(topo_diff.node_set_add) l_add_map = db_util.meta_attr_list_to_meta_attr_map(topo_diff.link_set_add) + l_rm_set = [] + n_rm_set = topo_diff.node_set_rm # # [!] order critical # if len(n_add_map) > 0: - op_n_add = DBO_add_node_set(n_add_map) - self.add_sub_op(op_n_add) + op = DBO_add_node_set(n_add_map) + self.add_sub_op(op) if len(l_add_map) > 0: - op_l_add = DBO_add_link_set(l_add_map) - self.add_sub_op(op_l_add) + op = DBO_add_link_set(l_add_map) + self.add_sub_op(op) + + if len(l_rm_set) > 0: + pass + + if len(n_rm_set) > 0: + op = DBO_rm_node_set(n_rm_set) + self.add_sub_op(op) class DBO_attr_diff_commit(DB_op): """ -- cgit v1.3.1