add the generation of messages collections

totoro
1 parent 3c636a92
Showing 10 changed files with 525 additions and 39 deletions Show diff stats
.gitmodules
calexium_lib
densaku.aproj
src/generation/files.anubis
src/generation/message_header.anubis
src/generation/message_messages.anubis
src/generation/messages.anubis
src/generation/types_header.anubis
src/generation/types_messages.anubis
src/main.anubis
 [submodule "densaku_lib"]
 	path = densaku_lib
 	url = git@gitlab.anubis-language.com:totoro/densaku_lib.git
+[submodule "calexium_lib"]
+	path = calexium_lib
+	url = ssh://git@gitlab.calexium.com:33022/calexium/calexium_lib.git
+Subproject commit a3acb343c746388ec4fb76fceabc1f22e9f3c37d
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>Exe</OutputType>
     <RootNamespace>takaden</RootNamespace>
-    <AssemblyName>takaden</AssemblyName>
+    <AssemblyName>densaku</AssemblyName>
     <StartupObject>src\main.anubis</StartupObject>
     <MakeUsedFile>False</MakeUsedFile>
     <MakeUnusedFile>False</MakeUnusedFile>
@@ -27,6 +27,31 @@
   </PropertyGroup>
   <Import Project="$(AnubisBinPath)\Anubis.Build.targets" />
   <ItemGroup>
+    <Folder Include="calexium_lib" />
+    <Folder Include="calexium_lib\asterisk" />
+    <Folder Include="calexium_lib\database" />
+    <Folder Include="calexium_lib\database\model" />
+    <Folder Include="calexium_lib\extensions" />
+    <Folder Include="calexium_lib\file_processor_io" />
+    <Folder Include="calexium_lib\file_processor_io\yaml" />
+    <Folder Include="calexium_lib\mail" />
+    <Folder Include="calexium_lib\mail\lexers" />
+    <Folder Include="calexium_lib\network" />
+    <Folder Include="calexium_lib\net_services" />
+    <Folder Include="calexium_lib\net_services_protocols" />
+    <Folder Include="calexium_lib\obj" />
+    <Folder Include="calexium_lib\os_tools" />
+    <Folder Include="calexium_lib\os_tools\freebsd" />
+    <Folder Include="calexium_lib\os_tools\linux" />
+    <Folder Include="calexium_lib\os_tools\linux\config" />
+    <Folder Include="calexium_lib\string" />
+    <Folder Include="calexium_lib\unit_test" />
+    <Folder Include="calexium_lib\web" />
+    <Folder Include="calexium_lib\web\jQuery" />
+    <Folder Include="calexium_lib\web\jQuery\ui-addon" />
+    <Folder Include="calexium_lib\web\js" />
+    <Folder Include="calexium_lib\web\piwik" />
+    <Folder Include="calexium_lib\web\widgets" />
     <Folder Include="densaku_lib" />
     <Folder Include="densaku_lib\types" />
     <Folder Include="library" />
@@ -76,6 +101,100 @@
     <Folder Include="library\xml" />
     <Folder Include="src" />
     <Folder Include="src\generation" />
+    <Compile Include="calexium_lib\asterisk\ami.anubis" />
+    <Compile Include="calexium_lib\asterisk\ami_commands.anubis" />
+    <Compile Include="calexium_lib\asterisk\ami_types.anubis" />
+    <Compile Include="calexium_lib\CXM_errors.anubis" />
+    <Compile Include="calexium_lib\CXM_message_constants.anubis" />
+    <Compile Include="calexium_lib\database\alter_table.anubis" />
+    <Compile Include="calexium_lib\database\db_types.anubis" />
+    <Compile Include="calexium_lib\database\db_utils.anubis" />
+    <Compile Include="calexium_lib\database\migration.anubis" />
+    <Compile Include="calexium_lib\database\migration_common.anubis" />
+    <Compile Include="calexium_lib\database\migration_common_sqlite3.anubis" />
+    <Compile Include="calexium_lib\database\migration_sqlite3.anubis" />
+    <Compile Include="calexium_lib\database\model\db_model.anubis" />
+    <Compile Include="calexium_lib\database\settings.anubis" />
+    <Compile Include="calexium_lib\database\settings_sqlite3.anubis" />
+    <Compile Include="calexium_lib\database\sqlite_foreign_key.anubis" />
+    <Compile Include="calexium_lib\extensions\json.anubis" />
+    <Compile Include="calexium_lib\file_processor_io\yaml\yaml.anubis" />
+    <Compile Include="calexium_lib\file_processor_io\yaml\yaml_parser.anubis" />
+    <Compile Include="calexium_lib\file_processor_io\yaml\yaml_type.anubis" />
+    <Compile Include="calexium_lib\mail\authentication.anubis" />
+    <Compile Include="calexium_lib\mail\lexers\enhanced_status.anubis" />
+    <Compile Include="calexium_lib\mail\send_mail.anubis" />
+    <Compile Include="calexium_lib\mail\send_mail_type.anubis" />
+    <Compile Include="calexium_lib\mail\smtp_client.anubis" />
+    <Compile Include="calexium_lib\mail\smtp_server_extensions.anubis" />
+    <Compile Include="calexium_lib\mail\tools.anubis" />
+    <Compile Include="calexium_lib\network\socket_pool.anubis" />
+    <Compile Include="calexium_lib\net_services\CXM_generic_client.anubis" />
+    <Compile Include="calexium_lib\net_services\CXM_generic_protocol.anubis" />
+    <Compile Include="calexium_lib\net_services\CXM_net_services.anubis" />
+    <Compile Include="calexium_lib\net_services_protocols\ftp_client.anubis" />
+    <Compile Include="calexium_lib\net_services_protocols\logger_service.anubis" />
+    <Compile Include="calexium_lib\net_services_protocols\pkg_updater_protocol.anubis" />
+    <Compile Include="calexium_lib\os_tools\freebsd\rc_conf.anubis" />
+    <Compile Include="calexium_lib\os_tools\linux\config\network_interface_file.anubis" />
+    <Compile Include="calexium_lib\string\crlf.anubis" />
+    <Compile Include="calexium_lib\unit_test\xml_rpc.unit_test.anubis" />
+    <Compile Include="calexium_lib\web\counter.anubis" />
+    <Compile Include="calexium_lib\web\CXM_common.anubis" />
+    <Compile Include="calexium_lib\web\CXM_cookies.anubis" />
+    <Compile Include="calexium_lib\web\CXM_dojo.anubis" />
+    <Compile Include="calexium_lib\web\CXM_dropzone.anubis" />
+    <Compile Include="calexium_lib\web\CXM_form.anubis" />
+    <Compile Include="calexium_lib\web\CXM_generic_form.anubis" />
+    <Compile Include="calexium_lib\web\CXM_generic_login.anubis" />
+    <Compile Include="calexium_lib\web\CXM_generic_table.anubis" />
+    <Compile Include="calexium_lib\web\CXM_html_tooltip.anubis" />
+    <Compile Include="calexium_lib\web\CXM_https_get.anubis" />
+    <Compile Include="calexium_lib\web\CXM_http_get.anubis" />
+    <Compile Include="calexium_lib\web\CXM_http_get_common.anubis" />
+    <Compile Include="calexium_lib\web\CXM_jquery.anubis" />
+    <Compile Include="calexium_lib\web\CXM_json.anubis" />
+    <Compile Include="calexium_lib\web\CXM_making_a_web_site.anubis" />
+    <Compile Include="calexium_lib\web\CXM_mime.anubis" />
+    <Compile Include="calexium_lib\web\CXM_multihost_http_server.anubis" />
+    <Compile Include="calexium_lib\web\CXM_style_tools.anubis" />
+    <Compile Include="calexium_lib\web\CXM_urllib.anubis" />
+    <Compile Include="calexium_lib\web\CXM_web_arg_encode.anubis" />
+    <Compile Include="calexium_lib\web\CXM_web_arg_utils.anubis" />
+    <Compile Include="calexium_lib\web\CXM_web_dump.anubis" />
+    <Compile Include="calexium_lib\web\CXM_widgets.anubis" />
+    <Compile Include="calexium_lib\web\CXM_xml_rpc.anubis" />
+    <Compile Include="calexium_lib\web\CXM_xml_rpc_parser.anubis" />
+    <Compile Include="calexium_lib\web\CXM_xml_rpc_types.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_animate.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_button.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_datatable.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_datatable_plugins.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_datatable_server_side.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_datatable_translation.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_datatable_types.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_dialog.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_easing.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_eudock.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_eudock_types.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_icons.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_jqplot.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_tabs.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_tiptip.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jquery_toolbar.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jq_checkbox.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jq_form.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\CXM_jq_radio.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\jq_flot.anubis" />
+    <Compile Include="calexium_lib\web\jQuery\ui-addon\datetimepicker.anubis" />
+    <Compile Include="calexium_lib\web\js_tools.anubis" />
+    <Compile Include="calexium_lib\web\piwik\CXM_piwik.anubis" />
+    <Compile Include="calexium_lib\web\widgets\button.anubis" />
+    <Compile Include="calexium_lib\web\widgets\css_helper.anubis" />
+    <Compile Include="calexium_lib\web\widgets\dashboard.anubis" />
+    <Compile Include="calexium_lib\web\widgets\fisheye_menu.anubis" />
+    <Compile Include="calexium_lib\web\widgets\icons_set.anubis" />
+    <Compile Include="calexium_lib\web\widgets\left_menu.anubis" />
     <Compile Include="densaku_lib\ds_generator.anubis" />
     <Compile Include="densaku_lib\types\densaku.anubis" />
     <Compile Include="densaku_lib\types\ds_message.anubis" />
@@ -440,11 +559,20 @@
     <Compile Include="library\xml\xml_parser.apg.anubis" />
     <Compile Include="library\xml\xml_parser_types.anubis" />
     <Compile Include="src\generation\files.anubis" />
+    <Compile Include="src\generation\messages.anubis" />
+    <Compile Include="src\generation\message_header.anubis" />
+    <Compile Include="src\generation\message_messages.anubis" />
     <Compile Include="src\generation\types.anubis" />
     <Compile Include="src\generation\types_header.anubis" />
     <Compile Include="src\generation\types_messages.anubis" />
     <Compile Include="src\main.anubis" />
     <Compile Include="src\types_checking.anubis" />
+    <None Include="calexium_lib\.git" />
+    <None Include="calexium_lib\.gitignore" />
+    <None Include="calexium_lib\obj\unit_test.aproj.FileListAbsolute.txt" />
+    <None Include="calexium_lib\unit_test.aproj" />
+    <None Include="calexium_lib\unit_test.ide" />
+    <None Include="calexium_lib\web\js\cxm_jquery_animate.js" />
     <None Include="library\anubis_doc.maml" />
     <None Include="library\compile_all.inproj" />
     <None Include="library\doc_tools\cows.jpg" />
@@ -10,27 +10,28 @@ read densaku_lib/types/densaku.anubis
 read densaku_lib/ds_generator.anubis
 read tools/basis.anubis
 read types_checking.anubis
-read generation/types.anubis
+read generation/types.anubis    //generate all types and the message for these types
+read generation/messages.anubis //generate all messages collection
 public define Maybe(One)
   generate_message_files
   (
     List(DS_Type)     types,             //Types description
-//    DS_Messages messages,
-    String      destination_dir
+    List(DS_Message)  messages,
+    String            destination_dir
   )=
   if check_types(types) is 
   {
     failure           then failure,
     success(_) then  
-      //since _types is hk_database(name, apps),
+
       println("Generating types and message files");
       make_all_types(types, destination_dir);
-      //make_vtm(apps, destination_dir);
-      //if generate_create_table(apps, destination_dir) is failure then println("failure");failure else
-      //println("Generating message collection");
-      //if generate_menus(apps, destination_dir) is failure then println("failure");failure else
+
+      println("Generating messages collection");
+      make_all_messages(messages, destination_dir);
+      
       success(unique)
   }.
+/*
+ * Created by PyramIDE.
+ * User: フランスのトトロ aka (David RENÉ) 
+ * Date: 23/01/2017
+ * Time: 22:37
+ * © Calexium 
+ */
+
+read tools/basis.anubis
+read tools/streams.anubis
+read tools/ISO-8601.anubis
+read system/string.anubis
+read densaku_lib/types/ds_types.anubis
+read densaku_lib/types/ds_message.anubis
+
+
+public define String
+  insert_read_foreign_type
+  (
+    DS_Message  ds_message   //type description
+  )=
+  with foreign_type_list = get_all_extern_type(ds_message),
+  join("", map((Extern_type ext_type) |-> since ext_type is extern(_, read_file), "read "+read_file+"\n", foreign_type_list))
+.
+  
+public define Maybe(One)
+  generate_message_header
+  (
+    Stream      stream,
+    DS_Message  ds_message   //type description
+   )=
+  write_string(stream,
+"/*
+ * Created by 伝作 (Densaku) 
+ * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
+ * Date: "+_Int_to_ISO_8601_date(now)+"
+ * Time: "+_Int_to_ISO_8601_time(now)+"
+ * 
+ */
+
+transmit system/muscle.anubis
+transmit system/convert.anubis
+transmit tools/basis.anubis
+
+" +
+  insert_read_foreign_type(ds_message)+
+"\n"
+  )
+  .
+  
+/*
+ * Created by PyramIDE.
+ * User: フランスのトトロ aka (David RENÉ) 
+ * Date: 23/01/2017
+ * Time: 23:00
+ * © Calexium 
+ */
+
+read tools/basis.anubis
+read tools/streams.anubis
+read tools/ISO-8601.anubis
+read system/string.anubis
+read densaku_lib/types/ds_message.anubis
+read types_messages.anubis
+
+public define Maybe(One)
+  generate_message_message_description
+  (
+    Stream      stream,
+    DS_Message  ds_message  //type description
+   )=
+  since ds_message is ds_message(message_name, _, fields),
+  with title = message_name+" message format",
+  write_string(stream,
+"\n"+
+"  "+title+"\n"+
+"  "+fill(length(title), '=')+"\n\n"+
+//  insert_type_message_description(ds_type)+
+"\n"
+  )
+.
+
+ public define String
+  anb_type_to_message
+  (
+    String          type_msg, 
+    DS_Anubis_Type  anb_type,
+    String          name
+  )=
+  with arg_name = "_"+to_lower(name),
+  if anb_type is 
+  {
+    one     then
+      "add_string("+type_msg+", \""+name+"\", "+arg_name+")",
+    bool    then
+      "add_bool("+type_msg+", \""+name+"\", "+arg_name+")",
+    int     then
+      "add_string("+type_msg+", \""+name+"\", to_String("+arg_name+"))",
+    string  then
+      "add_string("+type_msg+", \""+name+"\", "+arg_name+")",
+    float   then
+      "add_float("+type_msg+", \""+name+"\", "+arg_name+")",
+    ds_type(type_name)  then
+      "add_message("+type_msg+", \""+name+"\", to_Message("+arg_name+"))",
+    extern_type(type_name, _) then //external type. No need to check
+      "add_message("+type_msg+", \""+name+"\", to_Message("+arg_name+"))",    
+  }
+.
+
+define String
+  generate_fields_to_message
+  (
+    String        indent, 
+    String        message_msg,
+    List(DS_Field)  fields
+  )=
+  if fields is
+  {
+    []      then "\n",
+    [h . t] then 
+      since h is field(field_name, b_list, anb_type, comment),
+      with name = to_lower(field_name),
+      indent +"// [type = "+(if b_list is list then "List(" else "")+dump(anb_type)+(if b_list is list then ")" else "")+"] "+name+"\n"+
+      (if b_list is list then
+        indent +"map_forget(("+dump(anb_type)+ " _"+name+") |-> "+anb_type_to_message(message_msg, anb_type, field_name, name)+", __"+name+")"
+      else
+        indent +"forget("+anb_type_to_message(message_msg, anb_type, field_name, name)+")")
+      + ";\n" +
+      generate_fields_to_message(indent, message_msg, t)
+  }
+.  
+
+define String
+  argument_list_from_fields
+  (
+    String          indent,
+    List(DS_Field)  fields
+  )=
+  if fields is
+  {
+    []      then "",
+    [h . t] then
+      since h is field(name, b_list, anb_type, comment), 
+      indent+(if b_list is list then "List(" else "")+dump(anb_type)+(if b_list is list then ")" else "")+" _"+to_lower(name)+
+      (if is_empty(t) then "" else ",")+
+      (if comment is comment(comment_str) then "  //"+comment_str else "")+"\n"+
+      argument_list_from_fields(indent, t)
+  }
+.
+
+public define Maybe(One)
+  generate_to_message
+  (
+    Stream      stream,
+    DS_Message  ds_message   //type description
+   )=
+  since ds_message is ds_message(message_name, what_code, fields),
+ 
+ with lower_message_name = "_"+to_lower(message_name),
+       message_msg       = lower_message_name+"_message",
+  write_string(stream,
+
+"public define Message\n"+
+"  make_"+message_name+"\n"+
+"  (\n"+
+argument_list_from_fields("    ", fields)+
+"  )=\n"+
+"  with "+message_msg+" = message("+what_code+"),  //\n"+
+"  forget(add_string("+message_msg+", \"__MSG__\", \""+what_code+"\"));\n\n"+
+//"  if "+lower_message_name+" is\n"+
+generate_fields_to_message("  ", message_msg, fields) +
+//"  };\n"+
+"  "+message_msg+"\n"+
+".\n\n"
+  )
+.
+
+/****************************** FROM MESSAGE ***********************************/
+
+
+define String
+  generate_fields_from_message
+  (
+    String          indent, 
+    String          type_msg,
+    List(DS_Field)  fields,
+    Var(Int)        brace_counter    
+  )=
+  if fields is
+  {
+    []      then "",
+    [h . t] then 
+      since h is field(field_name, b_list, anb_type, comment),
+      with name = "_"+to_lower(field_name),
+      indent + "// [Field's type = "+(if b_list is list then "List(" else "")+dump(anb_type)+(if b_list is list then ")" else "")+"] Field's name '"+field_name+"'\n"+
+      (if b_list is list then
+        anb_type_list_from_message(indent, type_msg, anb_type, field_name, name, brace_counter)
+      else
+        anb_type_from_message(indent, type_msg, anb_type, field_name, name, brace_counter))
+      +
+      generate_fields_from_message(indent, type_msg, t, brace_counter)
+      
+  }
+.
+
+define String
+  anonymous_aggregat_from_fields
+  (
+    List(DS_Field)  fields
+  )=
+  if fields is
+  {
+    []      then "",
+    [h . t] then
+      since h is field(name, b_list, anb_type, comment), 
+      (if b_list is list then "List(" else "")+dump(anb_type)+(if b_list is list then ")" else "")+" _"+to_lower(name)+
+      (if is_empty(t) then "" else ", ")+
+      //(if comment is comment(comment_str) then "  //"+comment_str else "")+"\n"+
+      anonymous_aggregat_from_fields(t)
+  }
+.
+
+define String
+  anonymous_aggregat_value_from_fields
+  (
+    List(DS_Field)  fields
+  )=
+  join(", ", map((DS_Field field) |-> "_"+to_lower(field.field_name), fields)).
+  
+  if fields is
+  {
+    []      then "",
+    [h . t] then
+      since h is field(name, b_list, anb_type, comment), 
+      (if b_list is list then "List(" else "")+dump(anb_type)+(if b_list is list then ")" else "")+" _"+to_lower(name)+
+      (if is_empty(t) then "" else ", ")+
+      //(if comment is comment(comment_str) then "  //"+comment_str else "")+"\n"+
+      anonymous_aggregat_from_fields(t)
+  }
+.
+public define Maybe(One)
+/* generate the function which return Maybe(anonymous aggregat) from message.
+ * the aggregat contain all types used to construct the message
+ */
+ 
+  generate_from_message
+  (
+    Stream      stream,     //the file in which we write
+    DS_Message  ds_message  //type description
+   )=
+
+  since ds_message is ds_message(message_name, what_code, fields),
+  with brace_counter     = (Var(Int))var(0),
+      lower_message_name = "_"+to_lower(message_name),
+       message_msg       = lower_message_name+"_message",
+       
+  write_string(stream,
+"public define Maybe(("+anonymous_aggregat_from_fields(fields)+"))\n"+
+"  get_"+message_name+"\n"+
+"  (\n"+
+"    Message "+message_msg+"\n"+
+"  )=\n"+
+"  if find_string("+message_msg+", \"__MSG__\")     is  {failure then failure,  success(__msg__)     then\n"+
+"    if __msg__ = \""+what_code+"\" then \n"+
+with fields_from_message = generate_fields_from_message("      ",message_msg, fields, brace_counter),
+fields_from_message+
+"        success(("+anonymous_aggregat_value_from_fields(fields)+"))\n"+
+"      "+fill(*brace_counter, '}') +"\n"+
+"    else\n"+
+"      failure    //No valid message found !\n"+
+"  }\n"+
+".\n\n"
+  )
+.
+/*
+ * Created by PyramIDE.
+ * User: フランスのトトロ aka (David RENÉ) 
+ * Date: 23/01/2017
+ * Time: 10:09
+ * © Calexium 
+ */
+
+read generation/message_header.anubis
+read generation/message_messages.anubis
+
+read system/files.anubis
+read system/string.anubis
+read tools/streams.anubis
+read tools/basis.anubis
+read densaku_lib/types/ds_message.anubis
+
+
+define Maybe(One)
+  make_message_file
+  (
+    DS_Message  ds_message,   //type description
+    String      dest_dir
+  )
+  =
+  since ds_message is ds_message(name, _, fields),
+  println("Generating file for message ["+name+"]");
+  //TODO here replace all files by one with collection name
+  with file_name = dest_dir+"messages/generated/"+to_lower(name)+".anubis",
+
+  //create all necessary directories if doesn't exist.
+  make_directories(file_name);
+  
+  if file(file_name, new) is
+  {
+    failure     then  println("can't create file "+file_name);failure,
+    success(fd) then 
+      with strm = make_stream(fd),
+      if generate_message_header(strm, ds_message)                is { failure then failure, success(_) then
+//      if generate_type(strm, ds_message)                        is { failure then failure, success(_) then
+      if generate_message_message_description(strm, ds_message)   is { failure then failure, success(_) then
+      if generate_to_message(strm, ds_message)                    is { failure then failure, success(_) then
+      if generate_from_message(strm, ds_message)                  is { failure then failure, success(_) then
+      
+      success(unique)}}}}//}
+  }
+.
+
+public define One
+  make_all_messages
+  (
+    List(DS_Message)  messages,
+    String            destination_dir
+  )=
+  map_forget((DS_Message message) |-> since message is ds_message(message_name, what_code, ds_fields),
+                       println("generating message file for Message ["+message_name+"]");
+                       make_message_file(message, destination_dir), messages)
+.
@@ -16,7 +16,6 @@ read densaku_lib/types/ds_types.anubis
 public define String
   insert_read_foreign_type
   (
-//    Stream   stream,
     DS_Type  sd_type   //type description
   )=
   with foreign_type_list = get_all_extern_type(sd_type),
@@ -41,6 +40,7 @@ public define Maybe(One)
 transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
+
 " +
   insert_read_foreign_type(sd_type)+
 "\n"
@@ -40,29 +40,30 @@ public define Maybe(One)
   )
   .
-define String
+public define String
   anb_type_to_message
   (
     String          type_msg, 
     DS_Anubis_Type  anb_type,
+    String          field_name,
     String          name
   )=
   if anb_type is 
   {
     one     then
-      "add_string("+type_msg+", \""+name+"\", _"+name+")",
+      "add_string("+type_msg+", \""+field_name+"\", _"+name+")",
     bool    then
-      "add_bool("+type_msg+", \""+name+"\", _"+name+")",
+      "add_bool("+type_msg+", \""+field_name+"\", _"+name+")",
     int     then
-      "add_string("+type_msg+", \""+name+"\", to_String(_"+name+"))",
+      "add_string("+type_msg+", \""+field_name+"\", to_String(_"+name+"))",
     string  then
-      "add_string("+type_msg+", \""+name+"\", _"+name+")",
+      "add_string("+type_msg+", \""+field_name+"\", _"+name+")",
     float   then
-      "add_float("+type_msg+", \""+name+"\", _"+name+")",
+      "add_float("+type_msg+", \""+field_name+"\", _"+name+")",
     ds_type(type_name)  then
-      "add_message("+type_msg+", \""+name+"\", to_Message(_"+name+"))",
+      "add_message("+type_msg+", \""+field_name+"\", to_Message(_"+name+"))",
     extern_type(type_name, _) then //external type. No need to check
-      "add_message("+type_msg+", \""+name+"\", to_Message(_"+name+"))",    
+      "add_message("+type_msg+", \""+field_name+"\", to_Message(_"+name+"))",    
   }
 .
@@ -82,9 +83,9 @@ define String
       ";\n"+
       prefix +"// [type = "+(if b_list is list then "List(" else "")+dump(anb_type)+(if b_list is list then ")" else "")+"] "+alt_name+"."+name+"\n"+
       (if b_list is list then
-        prefix +"map_forget(("+dump(anb_type)+ " _"+name+") |-> "+anb_type_to_message(type_msg, anb_type, name)+", __"+name+")"
+        prefix +"map_forget(("+dump(anb_type)+ " _"+name+") |-> "+anb_type_to_message(type_msg, anb_type, name, name)+", __"+name+")"
       else
-        prefix +"forget("+anb_type_to_message(type_msg, anb_type, name)+")")
+        prefix +"forget("+anb_type_to_message(type_msg, anb_type, name, name)+")")
       +
       generate_component_to_message(prefix, type_msg, alt_name, t)
   }
@@ -165,7 +166,7 @@ public define Maybe(One)
 /****************************** FROM MESSAGE ***********************************/
-define String 
+public define String 
 /* anb_type_list_from_message
  * Generate the function which get the list of the target type ie. Bool, complex type, etc.
  * To do so, we get in the given Message, all fields with the name and encoded type of expected type.
@@ -181,6 +182,7 @@ define String
     String          indent,
     String          type_msg, 
     DS_Anubis_Type  anb_type,
+    String          field_name,
     String          name,
     Var(Int)        brace_counter
   )=
@@ -189,32 +191,33 @@ define String
     //empty then indent + "with " + name + " = map_escape(( String str ) |-> (Maybe(String)) from_Message(msg), find_strings("+type_msg+", \""+name+"\")),\n",
     one                       then
         brace_counter <- *brace_counter + 1;
-        indent + "with mb_" + name + " = map_escape((Message msg) |-> (Maybe("+dump(anb_type)+ ")) from_Message(msg), find_messages("+type_msg+", \""+name+"\")),\n"+
+        indent + "with mb_" + name + " = map_escape((Message msg) |-> (Maybe("+dump(anb_type)+ ")) from_Message(msg), find_messages("+type_msg+", \""+field_name+"\")),\n"+
         indent + "  if mb_" + name + " is {failure then failure, success("+ name + ") then \n",        
-    bool                      then indent + "with " + name + " = find_bool_list("+type_msg+", \""+name+"\"),\n",
+    bool                      then indent + "with " + name + " = find_bool_list("+type_msg+", \""+field_name+"\"),\n",
     int                       then
         brace_counter <- *brace_counter + 1;        
-        indent + "with mb_" + name + " = map_escape((String int_str) |-> decimal_scan(int_str), find_string_list("+type_msg+", \""+name+"\")),\n"+
+        indent + "with mb_" + name + " = map_escape((String int_str) |-> decimal_scan(int_str), find_string_list("+type_msg+", \""+field_name+"\")),\n"+
         indent + "  if mb_" + name + " is {failure then failure, success("+ name + ") then \n",
-    string                    then indent + "with " + name + " = find_string_list("+type_msg+", \""+name+"\"),\n",
-    float                     then indent + "with " + name + " = find_float_list("+type_msg+", \""+name+"\"),\n",
+    string                    then indent + "with " + name + " = find_string_list("+type_msg+", \""+field_name+"\"),\n",
+    float                     then indent + "with " + name + " = find_float_list("+type_msg+", \""+field_name+"\"),\n",
     ds_type(type_name)        then
         brace_counter <- *brace_counter + 1;
-        indent +"with mb_"+name+" = map_escape(( Message msg ) |-> (Maybe("+dump(anb_type)+ ")) from_Message(msg), find_message_list("+type_msg+", \""+name+"\")),\n"+
+        indent +"with mb_"+name+" = map_escape(( Message msg ) |-> (Maybe("+dump(anb_type)+ ")) from_Message(msg), find_message_list("+type_msg+", \""+field_name+"\")),\n"+
         indent +"  if mb_"+name+" is {failure then failure,  success("+name+") then\n",    
     extern_type(type_name, _) then
         brace_counter <- *brace_counter + 1;
-        indent +"with mb_"+name+" = map_escape(( Message msg ) |-> (Maybe("+dump(anb_type)+ ")) from_Message(msg), find_message_list("+type_msg+", \""+name+"\")),\n"+
+        indent +"with mb_"+name+" = map_escape(( Message msg ) |-> (Maybe("+dump(anb_type)+ ")) from_Message(msg), find_message_list("+type_msg+", \""+field_name+"\")),\n"+
         indent +"  if mb_"+name+" is {failure then failure,  success("+name+") then\n"    
   }
 .
-define String
+public define String
   anb_type_from_message
   (
     String          indent,
     String          type_msg, 
     DS_Anubis_Type  anb_type,
+    String          field_name,
     String          name,
     Var(Int)        brace_counter
   )=
@@ -222,27 +225,27 @@ define String
   {
     one     then
       brace_counter <- (*brace_counter + 1);
-      indent + "if find_string("+type_msg+", \""+name+"\")"+" is {failure then failure,  success(_) then with "+name+" = unique,\n",
+      indent + "if find_string("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success(_) then with "+name+" = unique,\n",
     bool    then
       brace_counter <- (*brace_counter + 1);
-      indent + "if find_bool("+type_msg+", \""+name+"\")"+" is {failure then failure,  success("+name+") then\n",
+      indent + "if find_bool("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success("+name+") then\n",
     int     then
       brace_counter <- (*brace_counter + 2);
-      indent + "if find_string("+type_msg+", \""+name+"\")"+" is {failure then failure,  success(_"+name+") then\n"+
+      indent + "if find_string("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success(_"+name+") then\n"+
       indent + "  if decimal_scan(_"+name+") is { failure then failure, success("+name+") then\n",
     string  then
       brace_counter <- (*brace_counter + 1);
-      indent + "if find_string("+type_msg+", \""+name+"\")"+" is {failure then failure,  success("+name+") then\n",
+      indent + "if find_string("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success("+name+") then\n",
     float   then
       brace_counter <- (*brace_counter + 1);    
-      indent + "if find_float("+type_msg+", \""+name+"\)"+" is {failure then failure,  success("+name+") then\n",
+      indent + "if find_float("+type_msg+", \""+field_name+"\)"+" is {failure then failure,  success("+name+") then\n",
     ds_type(type_name)  then
       brace_counter <- (*brace_counter + 2);      
-      indent + "if find_message("+type_msg+", \""+name+"\")"+" is {failure then failure,  success("+name+"_msg) then\n"+
+      indent + "if find_message("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success("+name+"_msg) then\n"+
       indent + "  if (Maybe("+type_name+"))from_Message("+name+"_msg)"+"  is {failure then failure,  success("+name+") then\n",
     extern_type(type_name, _) then //external type. No need to check
       brace_counter <- (*brace_counter + 2);      
-      indent + "if find_message("+type_msg+", \""+name+"\")"+" is {failure then failure,  success("+name+"_msg) then\n"+
+      indent + "if find_message("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success("+name+"_msg) then\n"+
       indent + "  if (Maybe("+type_name+"))from_Message("+name+"_msg)"+"  is {failure then failure,  success("+name+") then\n", 
   }
 .
@@ -271,9 +274,9 @@ define String
       since h is component(b_list, anb_type, name, comment),
       indent + "// [type = "+(if b_list is list then "List(" else "")+dump(anb_type)+(if b_list is list then ")" else "")+"] "+alt_name+"."+name+"\n"+
       (if b_list is list then
-        anb_type_list_from_message(indent, type_msg, anb_type, name, brace_counter)
+        anb_type_list_from_message(indent, type_msg, anb_type, name, name, brace_counter)
       else
-        anb_type_from_message(indent, type_msg, anb_type, name, brace_counter))
+        anb_type_from_message(indent, type_msg, anb_type, name, name, brace_counter))
       +
       generate_component_from_message(indent, type_msg, alt_name, t, brace_counter)
@@ -22,7 +22,16 @@
 read densaku_lib/types/densaku.anubis
 read generation/files.anubis
+read calexium_lib/CXM_message_constants.anubis
+public define List(DS_Message) the_messages_list =
+  [
+    ds_message("Get_Domain_Name", "_CXM_DOMAIN_GET_NAME", [
+      field("SERIAL",  string,   comment("MF Serial number")),
+      field("CXM_Key", string,   comment("Calexium Key provided during the order process")),
+    ])
+  ].
+  
 public define List(DS_Type) the_types_list =
   [
     ds_type("User_Account", [  
@@ -60,6 +69,13 @@ public define List(DS_Type) the_types_list =
         component(list, ds_type("HK_Table"),"hk_tables")
       ])
     ]),
+    ds_type("HK_Database", [
+      alternative("hk_database", [
+        component(string, "name",                   comment("name of the database")),
+        component(list, ds_type("HK_App"), "apps",  comment("list of applications"))
+      ])
+    ]),
+        
     ds_type("HK_Help_Text", [
       enum("no_help_text", comment("no help text available")),
       alternative("help_text_TAG",  [component(string, "tag_name", comment("TAG use with Anubis translation tool /locale/L3.anubis"))]),
@@ -70,6 +86,8 @@ public define List(DS_Type) the_types_list =
       alternative("icon16", [component(string, "name")])
     ]),    
   ].
+
+
  global define One 
   takaden
@@ -88,5 +106,5 @@ global define One
     List(String) args
   )=
   //print(dump_TK_Type_list(the_types_list)).
-  forget(generate_message_files(the_types_list, "")).
+  forget(generate_message_files(the_types_list, the_messages_list, "")).