David RENÉ · David RENÉ · David RENÉ · David RENÉ · David RENÉ · David RENÉ
Showing 8 changed files Show diff stats
anubis_dev/library/data_base/db_tools.anubis
anubis_dev/library/data_base/read_csv.anubis
anubis_dev/library/data_base/sqlite.anubis
anubis_dev/library/locale/L3.anubis
anubis_dev/library/locale/L3LanguageInfo.anubis
anubis_dev/library/locale/iso3166-1.anubis
anubis_dev/library/tools/buffered_connection.anubis
anubis_dev/library/tools/function.anubis
@@ -149,9 +149,10 @@ public define Int -&gt; Float
     Int -> DbDatum row
   )=
   (Int i) |->
-  if row(i) is db_float(f) then 
+  with result = row(i),
+  if result is db_float(f) then 
     f
-  else if row(i) is db_integer(n) then 
+  else if result is db_integer(n) then
     to_Float(n)
   else
     0.0
@@ -136,7 +136,7 @@ global define One
    make_precompiled_lexer("csv_to_eol",          to_eol_description,                  '#'). 
-execute anbexec make_the_lexers
+execute anbexec.1.19 make_the_lexers
 read generated/csv_c_begin_cell.anubis
 read generated/csv_c_quoted_cell.anubis
 read generated/csv_c_skip_cell.anubis
@@ -587,7 +587,7 @@ public define Result((SQLite3Error, Maybe($R)), $R)
                 success(fn) then fn
               },
   protect
-  println("BEGIN transaction for "+name);
+  //println("BEGIN transaction for "+name);
   if sql_query_timeout(db, "BEGIN", [], timeout, ms_retry_delay) is
   {
     error(err)  then
@@ -608,7 +608,7 @@ public define Result((SQLite3Error, Maybe($R)), $R)
               error((sqlite3(0, "User function failed during transaction"), failure))
           },
         success(result) then 
-          println("transaction OK for "+name);
+          //println("transaction OK for "+name);
           if sql_query_timeout(db, "COMMIT", [], timeout, ms_retry_delay) is
           {
             error(err)  then log(err); 
@@ -620,7 +620,7 @@ public define Result((SQLite3Error, Maybe($R)), $R)
               };
               error((err, success(result))),  //error in the SQL request
             ok(_,_,_)       then 
-              println("transaction COMMIT OK for "+name);
+              //println("transaction COMMIT OK for "+name);
               ok(result)
           },
       }
@@ -139,7 +139,9 @@ public type L3LangDicProperty:
   l3LangDicProperty
     ( String  appName,        //name of application
       String  appHash,        //unique id of the application
-      String  lang_code,
+      String  lang_code,      //can be only language like 'fr' for french 
+                              //or 'fr-BE' which is a tuple of the language followed 
+                              //by the country here here this is a French in Belgium
       String  userdef,
       Int     creation_date,
       Int     last_update
 read tools/basis.anubis
 read system/string.anubis
-read locale/iso3166-1.anubis
+transmit locale/iso3166-1.anubis
 public type L3LanguageCode:
   symbolic,
   iso639_1(String),
   iso639_2(String),
-  vernacular(String). 
+  vernacular(String).
 public type L3LanguageInfo:
    lang_info(List(L3LanguageCode)             codes,             // like "en", "fr", ...
@@ -7,6 +7,8 @@
  *
  */
+read tools/function.anubis
+
   This list states the country names (official short names in English) in alphabetical 
   order as given in ISO 3166-1 and the corresponding ISO 3166-1-alpha-2 code elements. 
   The list is updated whenever a change to the official code list in ISO 3166-1 is 
@@ -20,28 +22,49 @@ public type L3CountryCode:
   other(String). 
 public type L3CountryInfo:
-   country_info(List(L3CountryCode)           codes,             // like "en", "fr", ...
-             String                           english_name,
-             String                           self_name).             // flag image
+   country_info(List(L3CountryCode) codes,             // like "en", "fr", ...
+            String                  flag,
+            String                  english_name,
+            String                  self_name).        // flag image
 public define List(L3CountryInfo)
   standard_countries =
   [
-    country_info([iso3166_1("AF")], "Afghanistan", "Afğānistān افغانستان"),
-    country_info([iso3166_1("AX")], "Åland Islands", "Åland, Ahvenanmaan maakunta"),
-    country_info([iso3166_1("AL")], "Albania", "Republika e Shqipërisë"),
-    country_info([iso3166_1("DZ")], "Algeria", "Al-Jumhurīyah al-Jazā’irīyah, الجمهورية الجزائرية الديمقراطية الشعبي"),
-    country_info([iso3166_1("AD")], "Andorra", "Principat d'Andorra, Principauté d'Andorre, Principado de Andorra"),
-    country_info([iso3166_1("AS")], "American Samoa", "Amerika Samoa"),
-    country_info([iso3166_1("AS")], "American Samoa", "Amerika Samoa"),
-    country_info([iso3166_1("AS")], "American Samoa", "Amerika Samoa"),
-    country_info([iso3166_1("AS")], "American Samoa", "Amerika Samoa"),
-    country_info([iso3166_1("AS")], "American Samoa", "Amerika Samoa"),
-    country_info([iso3166_1("AS")], "American Samoa", "Amerika Samoa"),
-    country_info([iso3166_1("AS")], "American Samoa", "Amerika Samoa"),
+    country_info([iso3166_1("AF")], "af", "Afghanistan", "Afğānistān افغانستان"),
+    country_info([iso3166_1("AX")], "ax", "Åland Islands", "Åland, Ahvenanmaan maakunta"),
+    country_info([iso3166_1("AL")], "al", "Albania", "Republika e Shqipërisë"),
+    country_info([iso3166_1("DZ")], "dz", "Algeria", "Al-Jumhurīyah al-Jazā’irīyah, الجمهورية الجزائرية الديمقراطية الشعبي"),
+    country_info([iso3166_1("AD")], "ad", "Andorra", "Principat d'Andorra, Principauté d'Andorre, Principado de Andorra"),
+    country_info([iso3166_1("AS")], "as", "American Samoa", "Amerika Samoa"),
+    country_info([iso3166_1("FR")], "fr", "France", "France")
   ].
+public define L3CountryInfo unknown_country_info =
+   country_info([other("unknown")], "unknown", "unknown", "unknown").
+   
+define L3CountryInfo
+  l3_get_country_info 
+  ( 
+    String country_code,
+    List(L3CountryInfo) l 
+  ) =
+   if l is 
+     {
+       [ ] then unknown_country_info,
+       [h . t] then
+         if (country_code = "symb") & member(h.codes, symbolic)    then h
+         else if member(h.codes, iso3166_1(country_code))  then h
+         else l3_get_country_info(country_code, t)
+     }.
+
+public define L3CountryInfo
+  l3_get_country_info 
+  ( 
+    String country_code
+  ) =
+  l3_get_country_info(country_code, standard_countries)
+.
   ANGOLA;AO
   ANGUILLA;AI
@@ -80,7 +80,7 @@ define One
          }
      }.
-define ReadResult
+define Maybe(ByteArray)
    read_from_connexion
      (
        Buffered_connection   connection,
@@ -109,14 +109,13 @@ define ReadResult
 //          ok(ba)  then ok(result + ba)
 //        }
     else 
-      ok(result_buffer)
+      success(result_buffer)
   else
     //if unow > dead_line then record_dubious_connection(connection,dead_line,dos) else
     if read(connection.conn, 32768, time_out) is // the connection is closed after 10 minutes of inactivity
     {
-      error   then /*println(pid + "read failed)");*/ error,
-      timeout then timeout,
-      ok(ba)  then 
+      failure     then failure,
+      success(ba) then 
         with size_read = length(ba),
         //the needed read is higher than the
         if size > size_read then
@@ -152,9 +151,8 @@ public define BC_Result
         failure then
           if read_from_connexion(connection, 1, t_out, constant_byte_array(1,0),0) is // the connection is closed after 10 minutes of inactivity
           {
-            error   then failure, //error(cannot_read_from_connection), */
-            timeout then timeout, //error(timeout(600)), */
-            ok(ba)  then if nth(0,ba) is 
+            failure     then failure, //error(cannot_read_from_connection), */
+            success(ba) then if nth(0,ba) is 
             {
               failure    then failure // error(cannot_read_from_connection),
               success(c) then 
@@ -254,7 +254,28 @@ public define List($C)
       [x . map_parameter(f, p1, t)]
   }
 .
-    
+
+public define $P
+/** 'map' with a dynamic parameter. A new parameter is return as a result and
+ *  pass through as parameter with next call iteration and finally returned as 
+ *  result of the map_parameter. This allows to make computation on the parameter
+ *  like a sum
+ */
+  map_compute
+  (
+    ($P,$B) -> $P    f,  //
+    $P               p,  //initial parameter
+    List($B)         l   //
+  ) =
+  if l is 
+  {
+    [ ]     then p,
+    [h . t] then 
+      with p1 = f(p, h),
+      map_compute(f, p1, t)
+  }
+.
+
 public define List($C)
 /** 'map' with a dynamic parameter. A new parameter is return with the result and
  *  pass through as parameter with next call iteration
@@ -669,4 +690,4 @@ public define macro $T
    (($T t) |-f-> if test(t) then f(step(t)) else t)(init).  // terminal call !
-   
 \ No newline at end of file
+