From b27aa64f6c6130910ed2131bc980e1b93c6d6620 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 30 Mar 2015 19:18:33 +0300 Subject: rz_api_rest: __context__common: - lookup rzdoc by rzdoc_name - raise cache lookup exception - support rzdoc-less context if no rzdoc_name is provided --- src/server/rz_api_rest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py index 658327e5..a7e169b6 100644 --- a/src/server/rz_api_rest.py +++ b/src/server/rz_api_rest.py @@ -34,7 +34,6 @@ log = logging.getLogger('rhizi') db_ctl = None # injected: DB controller -def __context__common(rzdoc_id=None): class Req_Context(): """ Request context: @@ -46,16 +45,22 @@ class Req_Context(): self.user_name = None self.rzdoc = None +def __context__common(rzdoc_name=None): """ - build a common rquest context to pass along with a kernel diff commit: + Common request context builder passed along with kernel calls: - set user_name + - set rzdoc if rzdoc_name argument was supplied + + @raise RZDoc_Exception__not_found: if rzdoc_name arg was passed and document was not found """ ret = Req_Context() if session.has_key('username'): ret.user_name = session['username'] - ret['rzdoc_id'] = rzdoc_id + if None != rzdoc_name: + s_rzdoc_name = sanitize_input__rzdoc_name(rzdoc_name, current_app.rz_config) + ret.rzdoc = cache_lookup__rzdoc(s_rzdoc_name) return ret def __load_node_set_by_id_attr_common(id_set): -- cgit v1.3.1