rz_clone(): relocate to rz_api_rest

3 files changed, 26 insertions, 21 deletions

diff --git a/src/server/rz_api.py b/src/server/rz_api.py
index 40d305c4..f2fb9936 100644
--- a/src/server/rz_api.py
+++ b/src/server/rz_api.py
@@ -99,27 +99,6 @@ def load_link_set_by_link_ptr_set():
     op = DBO_load_link_set.init_from_link_ptr_set(l_ptr_set)
     return __common_exec(op)
 
-def rz_clone():
-
-    def sanitize_input(req):
-        rzdoc_name = req.get_json().get('rzdoc_name')
-        return rzdoc_name
-
-    def on_success(topo_diff):
-        # serialize Topo_Diff before including in response
-        topo_diff_json = topo_diff.to_json_dict()
-        return common_resp_handle(topo_diff_json)
-
-    rzdoc_name = sanitize_input(request)
-    if None == rzdoc_name: # load welcome doc by default
-        rzdoc_name = current_app.rz_config.rzdoc_name__mainpage
-
-    rzdoc_id = map_rzdoc_name_to_rzdoc_id(rzdoc_name)
-
-    op = DBO_rz_clone()
-    op = QT_Node_Filter__Doc_ID_Label(rzdoc_id)(op)
-    return __common_exec(op, on_success=on_success)
-
 def diff_commit__set():
     """
     commit a diff set
diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py
index d06830e4..e4ea98b9 100644
--- a/src/server/rz_api_rest.py
+++ b/src/server/rz_api_rest.py
@@ -14,6 +14,8 @@ from flask import request
 from flask import send_from_directory
 from flask import session
 from flask import url_for
+from flask import current_app
+
 import flask
 import logging
 import traceback
@@ -24,6 +26,8 @@ from rz_api_common import sanitize_input__attr_diff, map_rzdoc_name_to_rzdoc_id
 from rz_api_common import sanitize_input__topo_diff
 from rz_api_common import validate_obj__attr_diff
 from rz_req_handling import common_resp_handle
+from db_op import DBO_rz_clone
+from neo4j_cypher import QT_Node_Filter__Doc_ID_Label
 
 
 log = logging.getLogger('rhizi')
@@ -43,6 +47,27 @@ def __context__common(rzdoc_id=None):
     ret['rzdoc_id'] = rzdoc_id
     return ret
 
+def rz_clone():
+
+    def sanitize_input(req):
+        rzdoc_name = req.get_json().get('rzdoc_name')
+        return rzdoc_name
+
+    def on_success(topo_diff):
+        # serialize Topo_Diff before including in response
+        topo_diff_json = topo_diff.to_json_dict()
+        return common_resp_handle(topo_diff_json)
+
+    rzdoc_name = sanitize_input(request)
+    if None == rzdoc_name: # load welcome doc by default
+        rzdoc_name = current_app.rz_config.rzdoc_name__mainpage
+
+    rzdoc_id = map_rzdoc_name_to_rzdoc_id(rzdoc_name)
+
+    op = DBO_rz_clone()
+    op = QT_Node_Filter__Doc_ID_Label(rzdoc_id)(op)
+    return __common_exec(op, on_success=on_success)
+
 def rzdoc__new():
     # TODO: add doc node, set doc label, associate user-doc
     
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index dd1548b6..67341c74 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -218,6 +218,7 @@ def init_rest_interface(cfg, flask_webapp):
     rest_entry_set = [
                       # REST endpoints
                       rest_entry('/feedback', rz_feedback.rest__send_user_feedback__email),
+                      rest_entry('/graph/clone', rz_api_rest.rz_clone),
                       rest_entry('/graph/clone', rz_api.rz_clone),
                       rest_entry('/graph/diff-commit-set', rz_api.diff_commit__set),
                       rest_entry('/graph/diff-commit-topo', rz_api_rest.diff_commit__topo),