summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-01-06 17:27:42 +0200
committerLV-426 <lv-426@taproot.org.il>2015-01-06 17:30:14 +0200
commit964df203794ed050d2f72894fd1bcf3ec8f9b817 (patch)
tree6514efcb22d6fedd9c765badd0e7af535831c815 /src/server
parent9d46e883fd8968f5bede0808035c9c45d2c65aaa (diff)
DBO_topo_diff_commit -> DBO_diff_commit__topo, same for __attr
Diffstat (limited to 'src/server')
-rw-r--r--src/server/db_op.py8
-rw-r--r--src/server/rz_api.py4
-rw-r--r--src/server/rz_kernel.py8
3 files changed, 10 insertions, 10 deletions
diff --git a/src/server/db_op.py b/src/server/db_op.py
index 1dee7fe1..22800953 100644
--- a/src/server/db_op.py
+++ b/src/server/db_op.py
@@ -232,14 +232,14 @@ class DBO_cypher_query(DB_op):
super(DBO_cypher_query, self).__init__()
self.add_statement(q, q_params)
-class DBO_topo_diff_commit(DB_composed_op):
+class DBO_diff_commit__topo(DB_composed_op):
"""
commit a Topo_Diff
@return: a Topo_Diff of the actual committed changes
"""
def __init__(self, topo_diff):
- super(DBO_topo_diff_commit, self).__init__()
+ super(DBO_diff_commit__topo, self).__init__()
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)
@@ -322,7 +322,7 @@ class DBO_topo_diff_commit(DB_composed_op):
return topo_diff
-class DBO_attr_diff_commit(DB_op):
+class DBO_diff_commit__attr(DB_op):
"""
commit a Attr_Diff, return an Attr_Diff
@@ -331,7 +331,7 @@ class DBO_attr_diff_commit(DB_op):
actually changed, only that it has been 'touched'
"""
def __init__(self, attr_diff):
- super(DBO_attr_diff_commit, self).__init__()
+ super(DBO_diff_commit__attr, self).__init__()
self.op_return_value__attr_diff = attr_diff # cache attr_diff as return value on success
diff --git a/src/server/rz_api.py b/src/server/rz_api.py
index aded30a9..3b6d9585 100644
--- a/src/server/rz_api.py
+++ b/src/server/rz_api.py
@@ -33,7 +33,7 @@ from db_op import DBO_match_node_set_by_id_attribute
from db_op import DBO_match_node_id_set
from db_op import DBO_load_link_set
from db_op import DBO_rz_clone
-from db_op import DBO_topo_diff_commit
+from db_op import DBO_diff_commit__topo
from db_op import DBO_add_node_set
@@ -136,7 +136,7 @@ def diff_commit__set():
topo_diff = sanitize_input(request)
- op = DBO_topo_diff_commit(topo_diff)
+ op = DBO_diff_commit__topo(topo_diff)
return __common_exec(op)
def add_node_set():
diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py
index 46236e97..75fc959a 100644
--- a/src/server/rz_kernel.py
+++ b/src/server/rz_kernel.py
@@ -4,8 +4,8 @@ Rhizi kernel, home to core operation login
import db_controller
import logging
import traceback
-from db_op import DBO_attr_diff_commit
-from db_op import DBO_topo_diff_commit
+from db_op import DBO_diff_commit__attr
+from db_op import DBO_diff_commit__topo
log = logging.getLogger('rhizi')
@@ -18,7 +18,7 @@ class RZ_Kernel(object):
- socket.io calls
- future interfaces
"""
- op = DBO_topo_diff_commit(topo_diff)
+ op = DBO_diff_commit__topo(topo_diff)
try:
op_ret = db_ctl.exec_op(op)
return op_ret
@@ -28,7 +28,7 @@ class RZ_Kernel(object):
raise e
def diff_commit__attr(self, db_ctl, attr_diff):
- op = DBO_attr_diff_commit(attr_diff)
+ op = DBO_diff_commit__attr(attr_diff)
try:
op_ret = db_ctl.exec_op(op)
return op_ret