diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-03-30 20:21:28 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-04-01 22:25:54 +0300 |
| commit | c01ffbb3752f03a2301372eef4f603ce4459df4d (patch) | |
| tree | 945da07f0f982337dc744efd2e774dae511340d2 /src/server | |
| parent | 130081fdca18cad86834e15eeaaaa2448baea01c (diff) | |
rz_api: map REST path /rz/xxx
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/rz_api.py | 26 | ||||
| -rw-r--r-- | src/server/rz_server.py | 1 |
2 files changed, 12 insertions, 15 deletions
diff --git a/src/server/rz_api.py b/src/server/rz_api.py index 1444368e..17ab6fa7 100644 --- a/src/server/rz_api.py +++ b/src/server/rz_api.py @@ -8,25 +8,13 @@ from flask import escape from flask import render_template from flask import request from flask import session +from flask import redirect import logging -import traceback - -from db_op import DBO_diff_commit__topo -from db_op import DBO_load_link_set -from db_op import DBO_match_node_id_set -from db_op import DBO_match_node_set_by_id_attribute -from db_op import DBO_rz_clone -from model.graph import Topo_Diff -from model.model import Link -from rz_api_common import __sanitize_input, map_rzdoc_name_to_rzdoc_id -from rz_api_common import sanitize_input__topo_diff -from rz_api_rest import common_resp_handle -from neo4j_cypher import QT_Node_Filter__Doc_ID_Label - +from rz_api_common import sanitize_input__rzdoc_name log = logging.getLogger('rhizi') -def index(): +def index(rzdoc_name=None): # fetch rz_username for welcome message email_address = session.get('username') @@ -54,6 +42,14 @@ def index(): hostname = client_POV_server_name.split(':')[0] port = client_POV_server_name.split(':')[1] + if None == rzdoc_name: + s_rzdoc_name = current_app.rz_config.rzdoc__mainpage_name + else: + try: + s_rzdoc_name = sanitize_input__rzdoc_name(rzdoc_name, current_app.rz_config) + except Exception as e: + log.exception(e) + return render_template('index.html', rz_username=rz_username, rz_config__rzdoc_cur__name = s_rzdoc_name, diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 105807a5..3ad1cd2f 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -235,6 +235,7 @@ def init_rest_interface(cfg, flask_webapp): rest_entry('/signup', rz_user.rest__user_signup, {'methods': ['GET', 'POST']}), # doc endpoints + rest_entry('/rz/<path:rzdoc_name>', rz_api.index, {'methods': ['GET']}), # pretty URLs rest_entry('/graph/clone', rz_api_rest.rzdoc_clone), rest_entry('/rzdoc/list', rz_api_rest.rzdoc__list), rest_entry('/rzdoc/<path:rzdoc_name>/create', rz_api_rest.rzdoc__create), |
