From add6a35af21834e7480fa044b0abb9d8c2ce9cbf Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 20 Jan 2015 04:10:41 +0200 Subject: DBO_block_chain__commit: more cleanup --- src/server/db_op.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/server/db_op.py b/src/server/db_op.py index 0d21f1a0..f4923ce7 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -188,21 +188,16 @@ class DBO_block_chain__commit(DB_op): ret = sha1.hexdigest() return ret - def __init__(self, blob_obj): + def __init__(self, blob_obj, commit_obj=None): """ @param blob_obj: serializable blob @return: old_head, new_head, new_head.hash_value """ super(DBO_block_chain__commit, self).__init__() - self.blob_obj = blob_obj - hash_value = DBO_block_chainCommit.calc_blob_hash(blob_obj) - - name_value = hash_value[:8] + '...' if commit_obj == None else commit_obj.to_str__commit_name() - - self.n_name_value = name_value - self.n_id = hash_value - self.l_id = generate_random_id__uuid() + hash_value = DBO_block_chain__commit.calc_blob_hash(blob_obj) + name_value = hash_value[:8] + '...' if commit_obj == None else str(commit_obj) + l_id = generate_random_id__uuid() q_arr = ['match (old_head:__HEAD:Commit)', 'create (new_head:__HEAD:Commit {commit_attr})', @@ -220,6 +215,13 @@ class DBO_block_chain__commit(DB_op): } self.add_statement(q_arr, q_param_set) + # cache values necessary to generate op result + self.blob_obj = blob_obj + self.commit_obj = commit_obj + self.n_id = hash_value + self.n_name_value = name_value + self.l_id = l_id + def process_result_set(self): """ @return: a Topo_Diff object consisting of the commit node and parent link -- cgit v1.3.1