diff options
Diffstat (limited to 'bin/importer.ml')
| -rw-r--r-- | bin/importer.ml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/bin/importer.ml b/bin/importer.ml index c710aed..8549643 100644 --- a/bin/importer.ml +++ b/bin/importer.ml @@ -100,10 +100,12 @@ end Each value is given with the associated expression in the configuration, the function is expected to convert the result into string in order to include the content in the output CSV. *) -let printer : Path.t ImportExpression.T.t * ImportCSV.DataType.t -> string = - fun (column, value) -> +let printer : + string -> Path.t ImportExpression.T.t * ImportCSV.DataType.t -> string = + fun locale (column, value) -> ignore column; - ImportCSV.DataType.to_string value + (* Set the output locale accoording the configuration file *) + ImportCSV.DataType.to_string locale value let bom = "\xEF\xBB\xBF" @@ -119,6 +121,7 @@ let process_table : let source = Analyse.table mapping in (* Load all the element in the database *) let file = Filename.concat dirname source.file in + let locale = Option.value ~default:"" conf.configuration.locale in let file_date = creation_date file in let recent = @@ -134,7 +137,8 @@ let process_table : table. *) match ImportSQL.Db.query_headers db source with | Ok v -> - let text_headers = Array.map v ~f:ImportCSV.DataType.to_string in + let f = ImportCSV.DataType.to_string locale in + let text_headers = Array.map v ~f in Headers.SheeetMap.add source text_headers map | Error _ -> map) | _ -> @@ -159,7 +163,8 @@ let process_table : match headers_opt with | None -> map | Some v -> - let text_headers = Array.map v ~f:ImportCSV.DataType.to_string in + let f = ImportCSV.DataType.to_string locale in + let text_headers = Array.map v ~f in Headers.SheeetMap.add source text_headers map in headers @@ -197,7 +202,7 @@ let check_deps : exn = Failure (Printf.sprintf "Key '%s' not found" - (CSV.DataType.to_string value)); + (CSV.DataType.to_string "C" value)); } in @@ -289,9 +294,13 @@ let () = (* Run the query *) ignore @@ Db.create_view db conf.configuration; Printf.printf "Extracting results %!"; + + let locale = Option.value ~default:"" conf.configuration.locale in match Db.query db conf.configuration ~f:(fun v -> - let arr = Array.to_seq v |> Seq.map printer |> List.of_seq in + let arr = + Array.to_seq v |> Seq.map (printer locale) |> List.of_seq + in Helpers.Console.update_cursor (); Csv.output_record out_csv arr) |