diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-03-31 22:51:34 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-04-01 22:25:55 +0300 |
| commit | 762a4a86b0782b2cc5f80d439cc2e16ac47bf76d (patch) | |
| tree | 4e9899237a51a5513b3a2faaf85c5ce38756ac94 /src | |
| parent | 5b51845450a385773b0100705c38ab0a455f0793 (diff) | |
RZDoc: remove init id param, offset setting to caller
Diffstat (limited to 'src')
| -rw-r--r-- | src/server-tests/test_util.py | 5 | ||||
| -rw-r--r-- | src/server/db_op.py | 4 | ||||
| -rw-r--r-- | src/server/model/model.py | 4 | ||||
| -rw-r--r-- | src/server/rz_kernel.py | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py index eebff070..9226e856 100644 --- a/src/server-tests/test_util.py +++ b/src/server-tests/test_util.py @@ -58,8 +58,9 @@ def generate_random_link_dict(l_type, src_id, dst_id, lid=None): return ret_dict, lid def generate_random_RZDoc(test_label): - rzdoc_id = neo4j_util.generate_random_rzdoc_id() - return RZDoc(rzdoc_id, test_label) + rzdoc = RZDoc(test_label) + rzdoc.id = neo4j_util.generate_random_rzdoc_id() + return rzdoc def ws_emit__topo_diff(): import logging diff --git a/src/server/db_op.py b/src/server/db_op.py index 5556b3e0..02c7ed04 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -839,8 +839,8 @@ class DBO_rzdoc__lookup_by_name(DB_op): if not rzdoc_dict_set: return None rzdoc_dict = rzdoc_dict_set.pop() - rzdoc = RZDoc(rzdoc_id=rzdoc_dict['id'], - rzdoc_name=rzdoc_dict['name']) + rzdoc = RZDoc(rzdoc_name=rzdoc_dict['name']) + rzdoc.id = rzdoc_dict['id'] return rzdoc diff --git a/src/server/model/model.py b/src/server/model/model.py index 1a43cd40..a5119dd0 100644 --- a/src/server/model/model.py +++ b/src/server/model/model.py @@ -38,6 +38,6 @@ class Link(): class RZDoc(): - def __init__(self, rzdoc_id = None, rzdoc_name = None): - self.id = rzdoc_id + def __init__(self, rzdoc_name = None): + self.id = None # set upon DB commit self.name = rzdoc_name diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py index 0bba5102..ca9b56c4 100644 --- a/src/server/rz_kernel.py +++ b/src/server/rz_kernel.py @@ -128,8 +128,8 @@ class RZ_Kernel(object): @return: RZDoc object """ - rzdoc_id = neo4j_util.generate_random_rzdoc_id() - rzdoc = RZDoc(rzdoc_id, rzdoc_name) + rzdoc = RZDoc(rzdoc_name) + rzdoc.id = neo4j_util.generate_random_rzdoc_id() op = DBO_rzdoc__create(rzdoc) try: |