Merge branch 'release/ANUBIS_1_14' of ssh://gitlab.calexium.com:33022/calexium/c…

…alexium_lib into release/ANUBIS_1_14

Merge branch 'release/ANUBIS_1_14' of ssh://gitlab.calexium.com:33022/calexium/c…
…alexium_lib into release/ANUBIS_1_14
totoro
2 parents 56ebceb2 bd61d2eb
Showing 8 changed files with 542 additions and 15 deletions Show diff stats
densaku_types.anubis
ds_files/ds_messages.anubis
ds_files/ds_types.anubis
examples/minimal_web_site_vc.anubis
string/crlf.anubis
web/CXM_form.anubis
web/CXM_making_a_web_site.anubis
web/CXM_multihost_http_server.anubis
+/*
+ * Created by PyramIDE.
+ * User: フランスのトトロ aka (David RENÉ) 
+ * Date: 07/02/2017
+ * Time: 23:01
+ * © Calexium 
+ */
+
+
+read tools/basis.anubis
+read densaku_lib/ds_generator.anubis
+read calexium_lib/ds_files/ds_types.anubis
+read calexium_lib/ds_files/ds_messages.anubis
+
+
+global define One 
+  calexium_lib_ds
+  (
+    List(String) args        
+  ) =
+  if load_ds_generator is
+  {
+    failure         then  println("Densaku generator can't be load"),
+    success(ds_gen) then  forget(ds_gen.generate_type_files(calexium_lib_types_description, calexium_lib_messages_list, "ds_files/"))
+  }.
+
+execute anbexec calexium_lib_ds               // generate the file
+/*
+ * Created by PyramIDE.
+ * User: フランスのトトロ aka (David RENÉ) 
+ * Date: 07/02/2017
+ * Time: 23:05
+ * © Calexium 
+ */
+
+
+read densaku_lib/types/densaku.anubis
+
+public define List(DS_Message) calexium_lib_messages_list =
+  [
+
+  ].
+/*
+ * Created by PyramIDE.
+ * User: フランスのトトロ aka (David RENÉ) 
+ * Date: 07/02/2017
+ * Time: 23:05
+ * © Calexium 
+ */
+
+read densaku_lib/types/densaku.anubis
+
+public define List(DS_Type)  calexium_lib_types_description =
+  [
+//  public type DB_id:
+//    none,
+//    db_id(Int value).
+    ds_type("DB_id", [
+      enum("none", comment("no database Primary Key ID")),
+      alternative("db_id", [
+        component( int, "value", comment("Integer value of the Primary Key ID"))
+      ])
+    ]),
+
+// public type DB_datetime:
+//   db_datetime(String datetime). //Date and time in ISO8601 format "YYYY-MM-DD hh:mm:ss"
+    ds_type("DB_datetime", [
+      alternative("db_datetime", [
+        component(string, "datetime", comment("Date and time in ISO8601 format \"YYYY-MM-DD hh:mm:ss\""))
+      ])
+   ]),
+   
+// public type DB_date:
+//   db_date(String date).        //Date in ISO8601 format "YYYY-MM-DD"
+    ds_type("DB_date", [
+      alternative("db_date", [
+        component(string, "date", comment("Date and time in ISO8601 format \"YYYY-MM-DD\""))
+      ])
+   ]),
+   
+// public type DB_time:
+//   db_time(String time).        //Time in ISO8601 format "hh:mm:ss"
+    ds_type("DB_time", [
+      alternative("db_time", [
+        component(string, "time", comment("Date and time in ISO8601 format \"hh:mm:ss\""))
+      ])
+   ]),
+  
+// public type DB_integer:
+//   db_integer(Int value).
+// calexium_lib/database/db_types.anubis
+    ds_type("DB_integer", [
+      alternative("db_integer", [
+        component(int, "value", comment("Integer from datatase"))
+      ])
+   ]),
+
+//  public type MIME:
+//   mime(String        type,
+//        String        sybtype,
+//        List(String)  file_extensions).
+// library/web/mime.anubis
+    ds_type("MIME", [
+      alternative("mime", [
+        component(string, "type"),
+        component(string, "subtype"),
+        component(list, string, "file_extensions")
+      ])
+    ]),
+    
+  ]
+.
+
+   
+ *Project*                             The Anubis Project
+   
+ *Title*                               A minimal web site. 
+   
+ *Copyright*                     Copyright © Calexium www.calexium.com. 
+
+ *Released*
+
+ *Author*    David RENÉ
+   
+ *Overview*
+   
+   This file is just an example which may help to start making a web site with 
+   Anubis Calexium Library
+   It was based on the example for making a minimal web site made by Alain Prouté and located
+   in examples/network folder in standard library example
+   
+   This example is absolutely minimalist and manage only page.
+   
+
+read tools/basis.anubis                     // required for 'make_directory' and .
+read system/convert.anubis
+read calexium_lib/web/CXM_common.anubis                  // required for type 'Web_arg'
+read calexium_lib/web/CXM_multihost_http_server.anubis   // required for type 'HTTP_Info'
+read calexium_lib/web/CXM_controller.anubis
+read calexium_lib/web/CXM_making_a_web_site.anubis            
+read web/mime.anubis                        // required for list of known MIME types
+read calexium_lib/web/CXM_web_arg_utils.anubis   
+read calexium_lib/web/CXM_form.anubis
+read calexium_lib/web/jQuery/CXM_jquery_button.anubis
+   
+   *** Server directory. 
+   
+   A directory for putting files for all web sites. There will be one subdirectory per web
+   site.
+   
+define String web_sites_directory = my_anubis_directory+"/web_sites".
+   
+   
+define HTML_Partial_Content 
+  create_login_form
+  =
+
+    partial_content(
+      [css(css_file("css/login.css"))],
+    div([id("login")],
+      sequence([
+        //BODY
+        div([id("login_body")],
+          cxm_form( "login_form", [], "do_login", [], [],
+          [
+            input         (label(("LOGIN_NAME"),  no_help), wan("login_name"),   init(""), narrow, non_mandatory),
+            password_input(label(("PASSWORD"),    no_help), wan("password"),     init(""), narrow, non_mandatory),
+            partial(img_submit_button(("CONNECTION"), "login_form" ))
+          ])
+        ),
+      ])
+    )).
+
+define HTTP_Answer   
+  go_login
+  (
+    One state
+  )=
+  html_page
+  (
+    "Example Site 1",         // title of web site
+    [],                       // list of 'META' tags (empty for this site)
+    body                      // body of page
+    ( 
+      // list of body options
+      [
+        background_color(rgb(255,200,200))
+        // add more body options here
+      ],
+      
+      // content of page
+      partial(create_login_form)
+    )
+  )
+.
+   
+define HTTP_Answer   
+  compute_page_1
+  (
+    One state
+  )=
+  html_page
+  (
+    "Example Site 1",         // title of web site
+    [],                       // list of 'META' tags (empty for this site)
+    body                      // body of page
+    ( 
+      // list of body options
+      [
+        background_color(rgb(255,200,200))
+        // add more body options here
+      ],
+      
+      // content of page
+      center(text([size(14)],"This is the 'Example 1' web site."))
+    )
+  )
+.
+
+define (One, HTTP_Answer)
+  root_controller
+  (
+    HTTP_Info                    http_info,
+    List(Web_arg)                lwa,
+    Bool                         is_https,
+    One                          toto
+  )=
+  
+  with action = get_String(lwa, "action", "go_login"),
+  if action = "go_login" then
+    (unique, go_login(unique))
+  else
+    (unique, compute_page_1(unique)).
+  
+    
+define WEB_Controller(One)
+  make_root_controller
+  =
+  web_controller("root", root_controller)
+.
+  
+  Making the  description of web  site 1. In  this description, several elements  are the
+  bare  minimum.   There  is no  action  at  all,  no  data  base, almost  nothing.   See
+  'web/making_a_web_site.anubis'     for    the     declaration    of     the    function
+  'make_web_site_description'.
+
+define Web_Site
+  example_site_1
+  =
+  // make the directory for web site 1
+  // (subdirectories of it will be created automatically by the HTTP server)
+  forget((String)make_directory(web_sites_directory+"/example_site_1")); 
+   
+  // make a list of all possible 'host names' for web site 1:
+  with addresses = (List(String))
+                    [
+                      "example-site-1",     
+                      "127.0.0.1",
+                      "192.168.0.1"
+                      // add more adresses here
+                    ],
+   
+   // now make the description of the web site
+  make_web_site_controller_description(
+  
+    //this is the unique ID of the web site. This ID will be use for prepend the cookies
+    //names belonging to that web site
+    "example",
+    
+    // the list of addresses defined above
+    addresses, 
+    
+    // directory for the files of web site 1
+    web_sites_directory+"/example_site_1",
+    
+    // directory for the states of that web_site
+    web_sites_directory+"/example_site_1/states",
+    
+    // initializing function
+    (One u) |-> u,                    // nothing to initialize for web site 1
+    
+    // the function producing the initial state
+    (HTTP_Info    info,
+    List(Web_arg) lwa,
+    Bool          is_https) |-> unique,      // there is ony one possible state for web site 1
+    
+    // the function for handling expired tickets
+    // (tickets are kept  on the server's disk and represent states.  They are used for
+    //  passing     session     informations    from     pages     to    pages.     See
+    //  'web/CXM_making_a_web_site.anubis' for detailed explanations.)
+    (One            expired,
+    Maybe(String)   mb_action_name,
+    HTTP_Info       info,
+    List(Web_arg)   lwa,
+    Bool            is_https) |-> unique,     // keep the same state
+    
+    // the function for handling lost tickets
+    (Maybe(String)  mb_action_name,
+    HTTP_Info       info,
+    List(Web_arg)   lwa,
+    Bool            is_https) |-> unique,     // restart with default state
+    
+    var([make_root_controller]),
+    
+    // the function for producing additional HTTP headers
+    (One u) |-> [], 
+    
+    // timeout for tickets (in seconds)
+    3600,                                      // does'nt matter since only one state
+    
+    // list of redirections (one for each address)
+    // (see 'web/CXM_common.anubis' for the type 'Redirection')
+    redirection_list(map((String address) |-> redirect("/",address,"/index.awp"), addresses)), 
+    
+    // character encoding for web site 1
+    "UTF-8", 
+    
+    // list of URI extensions producing a console/journal message
+    [
+     ".awp",    // pages computed by this program
+     ".jpg",    // images, etc...
+     ".gif",
+     ".png"
+     // add more extensions here (they must be known; see 'web/mime.anubis')
+    ],
+    
+    // list of HTTP headers which are traced in the console/journal messages
+    [
+     "host", 
+     "user-agent"
+     // add more HTTP headers here
+    ],
+    
+    // secret string (used by 'private download')
+    "HUD76GRD56FD7GFDS4RT",            // for a real site, please choose another one
+                                      // it must remain secret
+    
+    // list of known MIME types (taken from 'web/mime.anubis')
+    known_mime_types, 
+    
+    // action to be performed before a file is sent
+    // (for example, this may be used for counting downloads)
+    (String         action_name, 
+    List(Web_arg)  lwa) |-> unique        // no action at all
+  )
+.
+   
+   
+   
+   
+   *** Example site 2. 
+   
+   Imagine another web site here...
+   
+   
+   
+   
+   
+   *** Starting all our web sites together.
+   
+global define One
+   minimal_web_site_vc
+     (
+       List(String) args
+     ) =
+   // make the directory for all web sites (if needed)
+   forget((String) make_directory(web_sites_directory)); 
+   
+   with http_port  = (Word32)8000,
+        https_port = (Word32)4430, 
+   // create a variable for handling the shutdown of our web sites
+   with shutdown_required = var(false),
+   with is_shutdown = (One u) |-> *shutdown_required, 
+   
+   // start all web sites
+  if start_web_sites(
+    0,                          // listen on all IP addresses
+    http_port,                  // port for HTTP
+    https_port,                 // port for HTTPS
+    "www.georges.example.com",  // common name of SSL certificate
+    [
+      example_site_1
+      // add other web sites here
+    ],
+    is_shutdown) is 
+  {
+    cannot_bind_to_port(n)     then println("Cannot bind to port: "+n),
+    cannot_bind_to_port(n,m)   then println("Cannot bind to ports: "+n+", "+m),
+    ok(s1,s2)                  then println("Servers started on ports "+http_port+" (HTTP) and "+https_port+" (HTTPS).")
+  }
+.
+   
+   
+   
@@ -101,13 +101,26 @@ public define ResultCopy
   copy_file_and_convert_to_CRLF
   ( 
     String                  file, 
-    ByteArray -> ByteArray  converter    
+    ByteArray -> ByteArray  converter,
+    Bool                    keep_org
   )=
   if rename(file, file+".tmp") then
     with result = copy_file_and_convert_to_CRLF(file+".tmp", file, converter),
-    forget(remove(file+".tmp"));
+    (if keep_org then
+      unique
+    else
+      forget(remove(file+".tmp")));
     result
   else
-    cant_create_file.
+    cant_create_file
+.
+public define ResultCopy 
+  copy_file_and_convert_to_CRLF
+  ( 
+    String                  file, 
+    ByteArray -> ByteArray  converter
+  )=
+  copy_file_and_convert_to_CRLF(file, converter, false)
+.
@@ -317,6 +317,11 @@ public define CXM_Form_Field
   submit(WEB_Action_Name action_name, Maybe(String) label, String button_text, List((String,String)) extra_operands)
   = submit([], htmlClass(""), action_name, label, button_text, extra_operands).
+public define CXM_Form_Field  //Helper for older project wich use only String as Action name
+  submit(String _action_name, Maybe(String) label, String button_text, List((String,String)) extra_operands)
+  = submit([], htmlClass(""), action_name(_action_name), label, button_text, extra_operands).
+
+
 public define CXM_Form_Field
   upload(HTML_Label label, HTML_Id id, WebArgName name, Width width)
   = upload([], label, id, name, width, non_mandatory).
@@ -634,6 +639,29 @@ public define HTML_Off_Form
     extra_ops,
     format_CXM_Form_Field(fields, lwa)
   ).
+  
+public define HTML_Off_Form
+/* older manner to call CXM_form with action as String.
+ * this function only exists for compatibility with older projects. Please consider
+ * to use the above function with WEB_Action_Name instead of String
+*/
+  cxm_form
+  (
+    HTML_Id               form_Id,
+    List(CoreAttrs)       options,
+    String                action,     //older manner to call action with String
+    List((String,String)) extra_ops,
+    List(Web_arg)         lwa,
+    List(CXM_Form_Field)  fields
+  ) =
+  
+  form(  
+    form_Id,
+    [class("cxm_form") . options],
+    action_name(action),
+    extra_ops,
+    format_CXM_Form_Field(fields, lwa)
+  ).
 public define HTML_Off_Form
   cxm_form
@@ -646,17 +674,19 @@ public define HTML_Off_Form
     List(CXM_Form_Field)  form_fields
   )=
   cxm_form(html_Id(form_name), options, action, extra_ops, lwa, form_fields).
-   
- public define HTML_In_Form
-  cxm_fieldset
+
+public define HTML_Off_Form
+  cxm_form
   (
-    HTML_Id                fieldSetId,
+    String                form_name, 
+    List(CoreAttrs)       options,
+    String                action, 
+    List((String,String)) extra_ops,
     List(Web_arg)         lwa,
-    List(CXM_Form_Field)  fields
-  ) =
-  cxm_fieldset([id(fieldSetId.id), class("aligned")], "", lwa, fields).
-
-
+    List(CXM_Form_Field)  form_fields
+  )=
+  cxm_form(html_Id(form_name), options, action_name(action), extra_ops, lwa, form_fields).
+  
 public define HTML_Off_Form
   cxm_form
@@ -1398,6 +1398,23 @@ public define HTML_In_Form
        String name
      ) =
    foreign_link([size(tsize)],url,name). 
+
+public define HTML_In_Form
+/* Older call with String as action instead of WEB_Action_Name. 
+ * This function exists only for compatibility with older project.
+ * Please condiser to use above function instead
+ */
+  actioner
+  (
+       Actioner_Connection    conn, 
+       Actioner_Target        targ, 
+       Actioner_Aspect        asp, 
+       String                 action, 
+       List((String,String))  extra_ops,
+       List(Actioner_Local_Action)  local_actions
+  )=
+  actioner(conn,targ,asp,action_name(action),extra_ops,local_actions)
+.
 public define HTML_In_Form
   actioner
@@ -1410,6 +1427,22 @@ public define HTML_In_Form
   )=
   actioner(conn,targ,asp,action,extra_ops,[])
 .
+
+public define HTML_In_Form
+/* Older call with String as action instead of WEB_Action_Name. 
+ * This function exists only for compatibility with older project.
+ * Please condiser to use above function instead
+ */
+  actioner
+  (
+       Actioner_Connection    conn, 
+       Actioner_Target        targ, 
+       Actioner_Aspect        asp, 
+       String                 action, 
+       List((String,String))  extra_ops
+  )=
+  actioner(conn,targ,asp,action_name(action),extra_ops,[])
+.
 public define HTML_In_Form
    actioner
@@ -1621,6 +1654,16 @@ public define HTML_Off_Form
   ) = 
   form(html_Id(form_name), options, action, extra_ops, content).
+public define HTML_Off_Form
+  form
+  (
+    String                form_name, 
+    List(CoreAttrs)       options,
+    String                action, 
+    List((String,String)) extra_ops,
+    HTML_In_Form          content
+  ) = 
+  form(html_Id(form_name), options, action_name(action), extra_ops, content).
 public define HTML_Off_Form literal(Printable_tree t) = literal_pt(t). 
 public define HTML_Off_Form fixed_size(HTML_Size width, HTML_Size height, String name_of_HTML_file)
@@ -1647,6 +1690,39 @@ public define HTML_Off_Form
        List((String,String))     extra_ops
      ) =
    actioner(conn,targ,asp,action,extra_ops,[]). 
+
+public define HTML_Off_Form
+/* Older call with String as action instead of WEB_Action_Name. 
+ * This function exists only for compatibility with older project.
+ * Please condiser to use above function instead
+ */
+  actioner
+  (
+       Actioner_Connection    conn, 
+       Actioner_Target        targ, 
+       Actioner_Aspect        asp, 
+       String                 action, 
+       List((String,String))  extra_ops,
+       List(Actioner_Local_Action)  local_actions
+  )=
+  actioner(conn,targ,asp,action_name(action),extra_ops,local_actions)
+.
+
+public define HTML_Off_Form
+/* Older call with String as action instead of WEB_Action_Name. 
+ * This function exists only for compatibility with older project.
+ * Please condiser to use above function instead
+ */
+  actioner
+  (
+       Actioner_Connection    conn, 
+       Actioner_Target        targ, 
+       Actioner_Aspect        asp, 
+       String                 action, 
+       List((String,String))  extra_ops
+  )=
+  actioner(conn,targ,asp,action_name(action),extra_ops,[])
+.
 public define HTML_Off_Form
    table
@@ -1890,7 +1966,19 @@ public type HTML_Meta:
    literal       (String). 
    Meta tags are put in the 'head' of the HTML page. 
-   
+
+public define HTML_Meta
+  refresh
+  (
+    Actioner_Connection connection,
+    Actioner_Target     target,
+    String              action, 
+    Int                 delay
+  )=
+  refresh(connection, target, action_name(action), delay)
+.
+  
+
 public type Body_Option:
    core_attrs(List(CoreAttrs)),
@@ -684,7 +684,8 @@ type EncodingType:
    www_url,
    multipart_form_data.
-public type BufferedConnection:
+
+type BufferedConnection:
   buffered_connection(Connection      conn,
                       Var(ByteArray)  buffer,
                       Var(Int)        read_pos,
@@ -692,13 +693,14 @@ public type BufferedConnection:
                       ).
-public define BufferedConnection
+define BufferedConnection
   buffered_connection
   (
     Connection      conn
   )=
   buffered_connection(conn, var(constant_byte_array(0, 0)), var(0), var([]))
   .
+
    *** [2] Tools.