From d0c372c0967fc2f8a22fc1377632c4b51b26846d Mon Sep 17 00:00:00 2001
From: totoro <david.rene@rack-matrix.com>
Date: Wed, 1 Apr 2020 10:04:40 +0900
Subject: [PATCH] add alternative fields_set in WEB_Session. This let create some fields gathered into named fields_set.

---
 web/CXM_making_a_web_site.anubis |   5 +++++
 web/CXM_web_session.anubis       | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 web/types/web_session.anubis     |  33 ++++++++++++++++++++++++++++-----
 3 files changed, 153 insertions(+), 17 deletions(-)

diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis
index 3d5e9c6..091baeb 100644
--- a/web/CXM_making_a_web_site.anubis
+++ b/web/CXM_making_a_web_site.anubis
@@ -1392,6 +1392,7 @@ public define HTML_Off_Form footer(HTML_Off_Form content)                       
 
   // <form>
 public define HTML_Off_Form form(List(CoreAttrs) attrs, List(HTML_Off_Form) content)    = html_tag("form", attrs, content).
+public define HTML_Off_Form form(CoreAttrs attr, List(HTML_Off_Form) content)           = html_tag("form", [attr], content).
 
   // <header>
 public define HTML_Off_Form header(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("header", attrs, content).
@@ -1527,7 +1528,11 @@ public define HTML_Off_Form strong(HTML_Off_Form content)                       
 
   // <textarea>
 public define HTML_Off_Form textarea(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("textarea", attrs, content).
+public define HTML_Off_Form textarea(List(CoreAttrs) attrs, Int cols, Int rows, List(HTML_Off_Form) content)  
+        = html_tag("textarea", [attr("cols",to_String(cols)), attr("rows",to_String(rows)) . attrs], content).
 public define HTML_Off_Form textarea(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("textarea", attrs, [content]).
+public define HTML_Off_Form textarea(List(CoreAttrs) attrs,  Int cols, Int rows, HTML_Off_Form content)        
+        = html_tag("textarea", [attr("cols",to_String(cols)), attr("rows",to_String(rows)) . attrs], [content]).
 public define HTML_Off_Form textarea(CoreAttrs attr, List(HTML_Off_Form) content)         = html_tag("textarea", [attr], content).
 public define HTML_Off_Form textarea(CoreAttrs attr, HTML_Off_Form content)               = html_tag("textarea", [attr], [content]).
 
diff --git a/web/CXM_web_session.anubis b/web/CXM_web_session.anubis
index 67bb21b..815071b 100644
--- a/web/CXM_web_session.anubis
+++ b/web/CXM_web_session.anubis
@@ -53,7 +53,27 @@ define Var(List(WEB_Session_Field))
   (
     List(WEB_Session_Field_No_Var)  fields
   )=
-  var(map((WEB_Session_Field_No_Var field) |->  session_field(field.field_name, field.field_type, var(field.field_datum)), fields))
+  var(map((WEB_Session_Field_No_Var field) |->  
+        with datum =  if field.field_datum is{
+                        string(v)     then string(v),
+                        bool(v)       then bool(v),
+                        int(v)        then int(v),
+                        db_id(v)      then db_id(v),
+                        message(v)    then message(v),
+                        byte_array(v) then byte_array(v),
+                        float(v)      then float(v),
+                        word128(v)    then word128(v),
+                        word64(v)     then word64(v),
+                        word32(v)     then word32(v),
+                        word16(v)     then word16(v),
+                        word8(v)      then word8(v),
+                        word4(v)      then word4(v),
+                        fields_set(v) then fields_set(to_WEB_Session_Field(v))
+                        },
+        session_field(field.field_name, field.field_type, var(datum))
+      ,
+      fields)
+  )
 .
 
 define List(WEB_Session_Field_No_Var)
@@ -61,7 +81,24 @@ define List(WEB_Session_Field_No_Var)
   (
     List(WEB_Session_Field)  fields
   )=
-  map((WEB_Session_Field field) |->  session_field(field.field_name, field.field_type, *field.field_datum), fields)
+  map((WEB_Session_Field field) |->
+    with datum =  if *field.field_datum is{
+                    string(v)     then string(v),
+                    bool(v)       then bool(v),
+                    int(v)        then int(v),
+                    db_id(v)      then db_id(v),
+                    message(v)    then message(v),
+                    byte_array(v) then byte_array(v),
+                    float(v)      then float(v),
+                    word128(v)    then word128(v),
+                    word64(v)     then word64(v),
+                    word32(v)     then word32(v),
+                    word16(v)     then word16(v),
+                    word8(v)      then word8(v),
+                    word4(v)      then word4(v),
+                    fields_set(v) then fields_set(to_WEB_Session_Field_No_Var(*v))
+                  },
+    session_field(field.field_name, field.field_type, datum), fields)
 .
   
 public define WEB_Session
@@ -1008,6 +1045,70 @@ public define One
   remove_any(fields, word4_t, _field_name)
 .
 
+  /*************** Fields_set *****************/
+
+  Maybe(Word4) get_Word4(fields, _field_name)
+  Word4        get_Word4(fields, _field_name, default_value)
+  
+public define Maybe(Var(List(WEB_Session_Field)))
+  get_Fields_set
+  (
+    Var(List(WEB_Session_Field))  fields,
+    String                        _field_name,
+  ) =
+  if get_field(*fields, fields_set_t, _field_name) is
+  {
+    failure         then failure,
+    success(datum)  then 
+      if datum is fields_set(value) then
+        success(value)
+      else
+        failure
+  }
+.
+
+public define Var(List(WEB_Session_Field))
+  get_Fields_set
+  (
+    Var(List(WEB_Session_Field))  fields,
+    String                        _field_name,
+    Var(List(WEB_Session_Field))  default_value
+  ) =
+  if get_Fields_set(fields, _field_name) is
+  {
+    failure         then default_value
+    success(value)  then value
+  }.
+
+
+public define One
+  put_Fields_set
+  (
+    Var(List(WEB_Session_Field))  _fields,
+    String                        _field_name,
+    Var(List(WEB_Session_Field))  _field_value
+  )=
+  _fields <- [session_field(_field_name, fields_set_t, var(fields_set(_field_value))) . *_fields]
+.
+
+public define One
+  replace_Fields_set
+  (
+    Var(List(WEB_Session_Field))  _fields,
+    String                        _field_name,
+    Var(List(WEB_Session_Field))  _field_value
+  )=
+  replace_any(_fields, fields_set_t, _field_name, fields_set(_field_value))
+.
+
+public define One
+  remove_Fields_set
+  (
+    Var(List(WEB_Session_Field))  _fields,
+    String                        _field_name
+  )=
+  remove_any(_fields, fields_set_t, _field_name)
+.
 
  /************************************************/
  "AWS_CURRENT_PAGE_TITLE"     String    current web page title
@@ -1039,10 +1140,13 @@ public define String  get_renderer(WEB_Session s)            = get_String    (s.
 
  /************************************************/
  
+public define String dump_WEB_Session_Field_list(List(WEB_Session_Field) _fields, String indent).
+
 public define String
   dump_WEB_Session_Field
   (
-    WEB_Session_Field _field
+    WEB_Session_Field _field,
+    String            indent
   )=
   with name = "Name = ["+_field.field_name+"]",
   if *_field.field_datum is
@@ -1060,35 +1164,39 @@ public define String
     word16(_word16)           then  name+", Type = Word16,  Value = ["+to_decimal(_word16)+"]",
     word8(_word8)             then  name+", Type = Word8,   Value = ["+to_decimal(_word8)+"]",
     word4(_word4)             then  name+", Type = Word4,   Value = ["+to_decimal(_word4)+"]",
+    fields_set(_fields)       then  name+", Type = Fields_set, \n"+dump_WEB_Session_Field_list(*_fields, indent+"  ")
   }
 .
 
 public define String
   dump_WEB_Session_Field_list
   (
-    List(WEB_Session_Field) _fields
+    List(WEB_Session_Field) _fields,
+    String                  indent
   )=
-  join("\n", map((WEB_Session_Field _field) |-> dump_WEB_Session_Field(_field), _fields))
+  join("\n", map((WEB_Session_Field _field) |-> dump_WEB_Session_Field(_field, indent), _fields))
 .
 
 
 public define String
   dump_WEB_Session_Fields
   (
-    List(WEB_Session_Field) _fields
+    List(WEB_Session_Field) _fields,
+    String                  indent
   )=
   "\n"+
-  "-- BEGIN Fields of Session:---------------- \n"+  
-  join("\n", map((WEB_Session_Field _field) |-> dump_WEB_Session_Field(_field), _fields))+
-  "\n-- END Fields of Session:---------------- \n"  
+  indent+"-- BEGIN Fields of Session:---------------- \n"+  
+  join("\n", map((WEB_Session_Field _field) |-> dump_WEB_Session_Field(_field, indent), _fields))+
+  "\n"+indent+"-- END Fields of Session:---------------- \n"  
 .
 
 public define String
   dump_WEB_Session_Fields
   (
-    Var(List(WEB_Session_Field)) _fields
+    Var(List(WEB_Session_Field)) _fields,
+    String                        indent
   )=
-  dump_WEB_Session_Fields(*_fields)
+  dump_WEB_Session_Fields(*_fields, indent)
 .
 
  *---------------------- DUMP ------------------*
@@ -1108,7 +1216,7 @@ public define String
   "----------------- \n"+
   "Session ID : ["+id+"]\n"+
   "Language   : ["+language+"]\n\n"+
-  dump_WEB_Session_Fields(*fields)+
+  dump_WEB_Session_Fields(*fields, "")+
   "-----------------------------------------------------------------------------\n"+  
   "Current WEB REQUEST:\n"+
   "-----------------------------------------------------------------------------\n"+
diff --git a/web/types/web_session.anubis b/web/types/web_session.anubis
index f2a270e..0720102 100644
--- a/web/types/web_session.anubis
+++ b/web/types/web_session.anubis
@@ -9,6 +9,9 @@
 read calexium_lib/web/CXM_common.anubis
 read calexium_lib/database/db_types.anubis
 
+public type WEB_Session_Field:...
+public type WEB_Session_Field_No_Var:...
+
 public type WEB_Session_Field_Datum:
   string(String),             //fully implented
   bool(Bool),                 //fully implented
@@ -22,7 +25,26 @@ public type WEB_Session_Field_Datum:
   word32(Word32),
   word16(Word16),
   word8(Word8),
-  word4(Word4)
+  word4(Word4),
+  fields_set(Var(List(WEB_Session_Field)))
+  //WEB_Request
+.
+
+public type WEB_Session_Field_Datum_No_Var:
+  string(String),             //fully implented
+  bool(Bool),                 //fully implented
+  int(Int),                   //fully implemented
+  db_id(DB_id),
+  message(Message),           //fully implemented
+  byte_array(ByteArray),
+  float(Float),
+  word128(Word128),
+  word64(Word64),
+  word32(Word32),
+  word16(Word16),
+  word8(Word8),
+  word4(Word4),
+  fields_set(List(WEB_Session_Field_No_Var))
   //WEB_Request
 .
 
@@ -39,7 +61,8 @@ public type WEB_Session_Field_Type:
   word32_t,
   word16_t,
   word8_t,
-  word4_t
+  word4_t,
+  fields_set_t
 .
 
 public type WEB_Session_Field:
@@ -51,9 +74,9 @@ public type WEB_Session_Field:
 
 public type WEB_Session_Field_No_Var:
   session_field(
-    String                   field_name,
-    WEB_Session_Field_Type   field_type,
-    WEB_Session_Field_Datum  field_datum   //Var because it can be replaced
+    String                          field_name,
+    WEB_Session_Field_Type          field_type,
+    WEB_Session_Field_Datum_No_Var  field_datum   //Var because it can be replaced
   ).
 
 public type WEB_Request:
--
libgit2 0.21.4