Force the locale before printing a result

7 files changed, 13 insertions, 30 deletions

diff --git a/lib/configuration/dune b/lib/configuration/dune
index 74ace87..6a0bc61 100755
--- a/lib/configuration/dune
+++ b/lib/configuration/dune
@@ -16,7 +16,6 @@
    ppx_deriving.show 

    ppx_deriving.eq 

  ))

- (foreign_stubs (language c) (names locale))

 )

 

 (rule

diff --git a/lib/configuration/importConf.ml b/lib/configuration/importConf.ml
index 2f56bd6..ebbcb7c 100644
--- a/lib/configuration/importConf.ml
+++ b/lib/configuration/importConf.ml
@@ -5,8 +5,6 @@ module Path = ImportDataTypes.Path
 module T = Read_conf
 module Expression = ImportExpression.T
 
-external set_locale : string -> unit = "set_locale"
-
 let latest_version = 1
 
 module TomlReader = Read_conf.Make (Helpers.Toml.Decode)
@@ -19,14 +17,7 @@ let t_of_toml : Otoml.t -> (Syntax.t, string) result =
       [ "version" ]
   in
   match version with
-  | n when n = latest_version ->
-      let conf = TomlReader.read toml in
-      let () =
-        Result.iter
-          (fun conf -> set_locale (Option.value ~default:"" conf.Syntax.locale))
-          conf
-      in
-      conf
+  | n when n = latest_version -> TomlReader.read toml
   | _ ->
       Printf.eprintf "Unsuported version : %d\n" version;
       exit 1
diff --git a/lib/configuration/locale.c b/lib/configuration/locale.c
deleted file mode 100644
index eeafd26..0000000
--- a/lib/configuration/locale.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-#include <locale.h>
-#include <caml/memory.h>
-#include <caml/alloc.h>
-
-CAMLprim value set_locale( value param )
-{
-    const char *s;
-    s = String_val(param);
-    setlocale(LC_NUMERIC, s);
-    return Val_unit;
-}
diff --git a/lib/csv/dataType.ml b/lib/csv/dataType.ml
index 1d2c7f9..6bf85ae 100644
--- a/lib/csv/dataType.ml
+++ b/lib/csv/dataType.ml
@@ -1,4 +1,4 @@
-external show_float : float -> string = "show_float"
+external show_float : string -> float -> string = "show_float"
 
 let match_date = Re.Str.regexp {|[0-9]+/[0-9]+/[0-9]+|}
 
@@ -9,11 +9,11 @@ type t =
   | Integer of int
   | Float of float
 
-let to_string = function
+let to_string locale = function
   | Null -> ""
   | Error s -> s
   | Integer i -> string_of_int i
-  | Float f -> show_float f
+  | Float f -> show_float locale f
   | Content c -> (
       match String.starts_with ~prefix:"0" c with
       | false -> c
diff --git a/lib/csv/dataType.mli b/lib/csv/dataType.mli
index ebb8bc7..df5edf1 100644
--- a/lib/csv/dataType.mli
+++ b/lib/csv/dataType.mli
@@ -5,4 +5,5 @@ type t =
   | Integer of int
   | Float of float
 
-val to_string : t -> string
+val to_string : string -> t -> string
+(** [to_string locale value] Format the text using the given locale *)
diff --git a/lib/csv/format.c b/lib/csv/format.c
index 31e4bbe..1394dc7 100644
--- a/lib/csv/format.c
+++ b/lib/csv/format.c
@@ -36,13 +36,17 @@ int asprintf(char *strp[], const char *fmt, ...) {
     return r;}
 #endif // asprintf
 
-CAMLprim value show_float( value float_param )
+CAMLprim value show_float(value locale_param, value float_param )
 {
-    CAMLparam1( float_param );
+    CAMLparam2(locale_param, float_param );
     CAMLlocal1( ml_data );
     double f = Double_val(float_param);
     char* raw_data;
+    const char *s;
+    s = String_val(locale_param);
+    const char *saved_locale = setlocale(LC_NUMERIC, s);
     int data_len = asprintf(&raw_data, "%f", f);
+    setlocale(LC_NUMERIC, saved_locale);
     ml_data = caml_copy_string( raw_data );
     free(raw_data);
     CAMLreturn( ml_data );
diff --git a/lib/errors/importErrors.ml b/lib/errors/importErrors.ml
index f888725..7433e9b 100644
--- a/lib/errors/importErrors.ml
+++ b/lib/errors/importErrors.ml
@@ -74,7 +74,7 @@ let output_error : t -> xlsError -> unit =
       string_of_int error.sheet;
       string_of_int error.row;
       target;
-      CSV.DataType.to_string error.value;
+      CSV.DataType.to_string "C" error.value;
       repr_error error.exn;
     ]