diff options
| author | Alon Levy <alon@pobox.com> | 2015-01-11 12:59:23 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-01-11 13:00:26 +0200 |
| commit | 076d3bfe539fe53458295d58ead91928280a6fd1 (patch) | |
| tree | 204f30f00411b6020ca0e94f3c355f67b570c2c4 /src | |
| parent | ea74876fb9d980b17db1bd504fb5ef28dd75382e (diff) | |
server/Topo_Diff: use link_id_set_rm and node_id_set_rm
To distinguish id sets from Node/Link sets.
Closes #250
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/db_op.py | 4 | ||||
| -rw-r--r-- | src/server/model/graph.py | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/server/db_op.py b/src/server/db_op.py index cb438fc3..5e49fea3 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -255,8 +255,8 @@ class DBO_diff_commit__topo(DB_composed_op): 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, meta_attr='__type') - l_rm_set = topo_diff.link_set_rm - n_rm_set = topo_diff.node_set_rm + l_rm_set = topo_diff.link_id_set_rm + n_rm_set = topo_diff.node_id_set_rm self.n_add_map = len(n_add_map) > 0 self.l_add_map = len(l_add_map) > 0 diff --git a/src/server/model/graph.py b/src/server/model/graph.py index 76368a24..430ffd13 100644 --- a/src/server/model/graph.py +++ b/src/server/model/graph.py @@ -105,19 +105,19 @@ class Topo_Diff(object): return obj.to_json_dict() def to_json_dict(self): - ret = {k: getattr(self, k) for k in ['link_set_rm', - 'node_set_rm', + ret = {k: getattr(self, k) for k in ['link_id_set_rm', + 'node_id_set_rm', 'node_set_add', 'link_set_add'] } return ret - def __init__(self, link_set_rm=[], - node_set_rm=[], + def __init__(self, link_id_set_rm=[], + node_id_set_rm=[], node_set_add=[], link_set_add=[]): - self.link_set_rm = link_set_rm - self.node_set_rm = node_set_rm + self.link_id_set_rm = link_id_set_rm + self.node_id_set_rm = node_id_set_rm self.node_set_add = node_set_add self.link_set_add = link_set_add @@ -138,8 +138,8 @@ class Topo_Diff(object): """ ret = Topo_Diff() - # merge keys - this allows constructor argument omission (link_set_rm, - # node_set_rm, etc.) such as when constructing from POST JSON data + # merge keys - this allows constructor argument omission (link_id_set_rm, + # node_id_set_rm, etc.) such as when constructing from POST JSON data for k, _ in ret.__dict__.items(): v = json_dict.get(k) if None != v: |