From 44eaa685b24da5795a0360cb78d5ce559a9b79d3 Mon Sep 17 00:00:00 2001 From: totoro Date: Wed, 8 Apr 2020 16:02:03 +0900 Subject: [PATCH] add "current page" in reserved key words for web session remove Int x (mod Int y) which already exists somewhere else --- web/CXM_generic_table.anubis | 20 ++++++++++---------- web/CXM_web_session.anubis | 16 +++++++++++----- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/web/CXM_generic_table.anubis b/web/CXM_generic_table.anubis index 9f9dfc8..23cfcd6 100644 --- a/web/CXM_generic_table.anubis +++ b/web/CXM_generic_table.anubis @@ -420,16 +420,16 @@ define List(HTML_Cell(HTML_In_Form)) ] }. -public define Int - Int x (mod Int y) - = - if x / y is - { - failure then 0, - success(result) then - if result is (q, r) then r - }. - +//public define Int +// Int x (mod Int y) +// = +// if x / y is +// { +// failure then 0, +// success(result) then +// if result is (q, r) then r +// }. +// public define HTML_In_Form diff --git a/web/CXM_web_session.anubis b/web/CXM_web_session.anubis index ad446df..1ba9b7a 100644 --- a/web/CXM_web_session.anubis +++ b/web/CXM_web_session.anubis @@ -16,11 +16,12 @@ read CXM_web_dump.anubis reserved fields keywords - "AWS" String - "AWS_CURRENT_PAGE_TITLE" String current web page title - "AWS_CURRENT_APP" String current web application - "AWS_CURRENT_SPACE" String current web space in application - "AWS_PAGE_RENDERER" String current + "AWS_CURRENT_PAGE_TITLE" String current web page title + "AWS_CURRENT_PAGE" String current web page + "AWS_CURRENT_APP" String current web application + "AWS_CURRENT_SPACE" String current web space in application + "AWS_CURRENT_CONTENT" String current in the web space + "AWS_CURRENT_PAGE_RENDERER" String current page renderer //"AWS_CURRENT_LEFT_MENU" Left_Menu current left menu on the page //"AWS_CURRENT_MENU" Menu current menu, on the top of the page @@ -66,6 +67,7 @@ public define WEB_Session_No_Var /************************************************/ "AWS_CURRENT_PAGE_TITLE" String current web page title + "AWS_CURRENT_PAGE" String current web page "AWS_CURRENT_APP" String current web application "AWS_CURRENT_SPACE" String current web space in application "AWS_CURRENT_CONTENT" String current in the web space @@ -83,6 +85,10 @@ public define One set_web_content(WEB_Session s, String n)= replace_String(s public define One set_web_content(Var(List(Session_Field)) fields, String n)= replace_String(fields, "AWS_CURRENT_CONTENT", n). public define String get_web_content(WEB_Session s) = get_String (s.fields, "AWS_CURRENT_CONTENT", ""). +public define One set_page(WEB_Session s, String n)= replace_String(s.fields, "AWS_CURRENT_PAGE", n). +public define One set_page(Var(List(Session_Field)) fields, String n)= replace_String(fields, "AWS_CURRENT_PAGE", n). +public define String get_page(WEB_Session s) = get_String (s.fields, "AWS_CURRENT_PAGE", ""). + public define One set_page_title(WEB_Session s, String n)= replace_String(s.fields, "AWS_CURRENT_PAGE_TITLE", n). public define One set_page_title(Var(List(Session_Field)) fields, String n)= replace_String(fields, "AWS_CURRENT_PAGE_TITLE", n). public define String get_page_title(WEB_Session s) = get_String (s.fields, "AWS_CURRENT_PAGE_TITLE", ""). -- libgit2 0.21.4