aboutsummaryrefslogtreecommitdiff
path: root/lib/file_handler
diff options
context:
space:
mode:
Diffstat (limited to 'lib/file_handler')
-rw-r--r--lib/file_handler/csv2sql.ml31
-rw-r--r--lib/file_handler/csv2sql.mli8
-rwxr-xr-xlib/file_handler/dune8
-rw-r--r--lib/file_handler/state.ml17
-rw-r--r--lib/file_handler/state.mli7
-rw-r--r--lib/file_handler/xlsx2sql.ml44
-rw-r--r--lib/file_handler/xlsx2sql.mli8
7 files changed, 63 insertions, 60 deletions
diff --git a/lib/file_handler/csv2sql.ml b/lib/file_handler/csv2sql.ml
index 42d84eb..a009f74 100644
--- a/lib/file_handler/csv2sql.ml
+++ b/lib/file_handler/csv2sql.ml
@@ -1,34 +1,33 @@
open StdLabels
module A = ImportAnalyser.Dependency
-module CSV = ImportCSV
module C = ImportContainers
-module Syntax = ImportConf.Syntax
module Db = ImportSQL.Db
-type state = CSV.DataType.t array State.t
+type state = ImportDataTypes.Value.t array State.t
let default_mapper :
- (ImportCSV.DataType.t, ImportCSV.DataType.t array) State.mapper =
- { get_row = Fun.id; get_value = Fun.id; default = ImportCSV.DataType.Null }
+ (ImportDataTypes.Value.t, ImportDataTypes.Value.t array) State.mapper =
+ { get_row = Fun.id; get_value = Fun.id; default = ImportDataTypes.Value.Null }
-let extract_values : string -> CSV.DataType.t =
+let extract_values : string -> ImportDataTypes.Value.t =
fun value ->
(* Test first if the content is empty *)
- if String.equal String.empty value then CSV.DataType.Null
+ if String.equal String.empty value then ImportDataTypes.Value.Null
else
(* else, try differents conversion in order to see which one works *)
match int_of_string_opt value with
- | Some i -> CSV.DataType.Integer i
+ | Some i -> ImportDataTypes.Value.Integer i
| None -> (
match float_of_string_opt value with
- | Some f -> CSV.DataType.Float f
+ | Some f -> ImportDataTypes.Value.Float f
| None ->
(* And finaly convert into date *)
- CSV.DataType.Content value)
+ ImportDataTypes.Value.Content value)
(** Initialize the state for the first row, count the column number and create
the table in the database *)
-let first_row : A.t -> _ Db.t -> state -> CSV.DataType.t list -> state =
+let first_row : A.t -> _ Db.t -> state -> ImportDataTypes.Value.t list -> state
+ =
fun mapping db acc row ->
(if acc.transaction then
match Db.commit db with
@@ -69,11 +68,11 @@ let read_csv_line :
let importInDatable :
log_error:ImportErrors.t ->
- conf:Syntax.t ->
+ conf:ImporterSyntax.t ->
dirname:string ->
A.t ->
'a Db.t ->
- CSV.DataType.t array option Lwt.t =
+ ImportDataTypes.Value.t array option Lwt.t =
fun ~log_error ~conf ~dirname mapping db ->
let file = Filename.concat dirname (A.table mapping).file in
@@ -86,7 +85,9 @@ let importInDatable :
This line could generate an error if the headers are not correctly defined.
*)
let header =
- List.map ~f:(fun v -> CSV.DataType.Content v) (Csv.next csv_channel)
+ List.map
+ ~f:(fun v -> ImportDataTypes.Value.Content v)
+ (Csv.next csv_channel)
in
let state =
@@ -110,7 +111,7 @@ let importInDatable :
with
| Csv.Failure (line, row, cause) as e ->
Printf.eprintf "Error %s on line %d — field : %s\n" cause line
- (ImportCSV.Csv.column_to_string row);
+ (ImportDataTypes.Path.column_to_string row);
raise e
in
ignore @@ State.clear ~log_error db mapping conf;
diff --git a/lib/file_handler/csv2sql.mli b/lib/file_handler/csv2sql.mli
index e09737b..8976034 100644
--- a/lib/file_handler/csv2sql.mli
+++ b/lib/file_handler/csv2sql.mli
@@ -1,10 +1,10 @@
val importInDatable :
log_error:ImportErrors.t ->
- conf:ImportConf.Syntax.t ->
+ conf:ImporterSyntax.t ->
dirname:string ->
ImportAnalyser.Dependency.t ->
_ ImportSQL.Db.t ->
- ImportCSV.DataType.t array option Lwt.t
-(** Load an excel spreadsheet in an SQLite database.
+ ImportDataTypes.Value.t array option Lwt.t
+(** Load an excel spreadsheet in an SQLite database.
-Return the header if at least one row where present *)
+ Return the header if at least one row where present *)
diff --git a/lib/file_handler/dune b/lib/file_handler/dune
index 02be751..80b2ff6 100755
--- a/lib/file_handler/dune
+++ b/lib/file_handler/dune
@@ -10,13 +10,11 @@
lwt
lwt.unix
helpers
- importAnalyser
- importConf
- importContainers
- importCSV
importDataTypes
+ importContainers
importErrors
- importExpression
+ importerSyntax
+ importAnalyser
importSQL
)
)
diff --git a/lib/file_handler/state.ml b/lib/file_handler/state.ml
index 5b43aff..7cf57da 100644
--- a/lib/file_handler/state.ml
+++ b/lib/file_handler/state.ml
@@ -18,7 +18,7 @@ type insert_result = {
type ('a, 'b) mapper = {
get_row : 'b -> 'a Array.t;
- get_value : 'a -> ImportCSV.DataType.t;
+ get_value : 'a -> ImportDataTypes.Value.t;
default : 'a;
}
@@ -105,14 +105,15 @@ let insert_row :
sheet = state.sheet_number;
row = state.row_number;
target = None;
- value = CSV.DataType.Content (String.concat ~sep:", " []);
+ value = ImportDataTypes.Value.Content (String.concat ~sep:", " []);
exn = e;
})
execution
-(** Load the row with all the informations associated with this sheet.
+(** Load the row with all the informations associated with this sheet.
- If an error has already been raised during the sheet, ignore this row only. *)
+ If an error has already been raised during the sheet, ignore this row only.
+*)
let run_row :
log_error:ImportErrors.t ->
mapper:(_, 'row) mapper ->
@@ -147,20 +148,20 @@ let clear :
log_error:ImportErrors.t ->
'a ImportSQL.Db.t ->
A.t ->
- ImportConf.Syntax.t ->
+ ImporterSyntax.t ->
unit ImportSQL.Db.result =
fun ~log_error db mapping conf ->
ImportSQL.Db.clear_duplicates db (A.table mapping) (A.keys mapping)
~f:(fun values ->
let line =
match snd @@ Array.get values 0 with
- | ImportCSV.DataType.Integer i -> i
+ | ImportDataTypes.Value.Integer i -> i
| _ -> -1
and value = snd @@ Array.get values 1
and target =
match snd @@ Array.get values 2 with
- | ImportCSV.DataType.Content s ->
- Some (ImportConf.get_table_for_name conf (Some s))
+ | ImportDataTypes.Value.Content s ->
+ Some (ImporterSyntax.get_table_for_name conf (Some s))
| _ -> None
in
let error =
diff --git a/lib/file_handler/state.mli b/lib/file_handler/state.mli
index f744c33..8e24b1b 100644
--- a/lib/file_handler/state.mli
+++ b/lib/file_handler/state.mli
@@ -15,7 +15,7 @@ type insert_result = {
type ('a, 'b) mapper = {
get_row : 'b -> 'a Array.t;
- get_value : 'a -> ImportCSV.DataType.t;
+ get_value : 'a -> ImportDataTypes.Value.t;
default : 'a;
}
@@ -41,6 +41,7 @@ val clear :
log_error:ImportErrors.t ->
'a ImportSQL.Db.t ->
ImportAnalyser.Dependency.t ->
- ImportConf.Syntax.t ->
+ ImporterSyntax.t ->
unit ImportSQL.Db.result
-(** Clean up the table after the insertion, check for the duplicates and external references *)
+(** Clean up the table after the insertion, check for the duplicates and
+ external references *)
diff --git a/lib/file_handler/xlsx2sql.ml b/lib/file_handler/xlsx2sql.ml
index f2d8f12..651059f 100644
--- a/lib/file_handler/xlsx2sql.ml
+++ b/lib/file_handler/xlsx2sql.ml
@@ -1,8 +1,6 @@
open StdLabels
module A = ImportAnalyser.Dependency
module C = ImportContainers
-module CSV = ImportCSV
-module Syntax = ImportConf.Syntax
module Db = ImportSQL.Db
let flags = Unix.[ O_RDONLY; O_NONBLOCK ]
@@ -10,24 +8,26 @@ let flags = Unix.[ O_RDONLY; O_NONBLOCK ]
let extractors =
SZXX.Xlsx.
{
- string = (fun _location s -> CSV.DataType.Content s);
+ string = (fun _location s -> ImportDataTypes.Value.Content s);
error =
- (fun _location s -> CSV.DataType.Error (Printf.sprintf "#ERROR# %s" s));
+ (fun _location s ->
+ ImportDataTypes.Value.Error (Printf.sprintf "#ERROR# %s" s));
boolean =
(fun _location s ->
let value = String.(equal s "1") in
- CSV.DataType.Content (string_of_bool value));
+ ImportDataTypes.Value.Content (string_of_bool value));
number =
(fun _location s ->
let f = Float.of_string s in
- if Float.is_integer f then CSV.DataType.Integer (Float.to_int f)
- else CSV.DataType.Float f);
- date = (fun _location s -> CSV.DataType.Content s);
- null = CSV.DataType.Null;
+ if Float.is_integer f then
+ ImportDataTypes.Value.Integer (Float.to_int f)
+ else ImportDataTypes.Value.Float f);
+ date = (fun _location s -> ImportDataTypes.Value.Content s);
+ null = ImportDataTypes.Value.Null;
formula =
(fun _location ~formula s ->
ignore formula;
- CSV.DataType.Content s);
+ ImportDataTypes.Value.Content s);
}
let feed_bigstring ic =
@@ -48,29 +48,31 @@ let is_delayed row =
| _ -> false)
let default_mapper :
- (ImportCSV.DataType.t, ImportCSV.DataType.t SZXX.Xlsx.row) State.mapper =
+ ( ImportDataTypes.Value.t,
+ ImportDataTypes.Value.t SZXX.Xlsx.row )
+ State.mapper =
{
get_value =
(function
- | ImportCSV.DataType.Content s ->
- ImportCSV.DataType.Content (SZXX.Xml.unescape s)
+ | ImportDataTypes.Value.Content s ->
+ ImportDataTypes.Value.Content (SZXX.Xml.unescape s)
| any -> any);
- default = ImportCSV.DataType.Null;
+ default = ImportDataTypes.Value.Null;
get_row = (fun v -> v.SZXX.Xlsx.data);
}
-type state = CSV.DataType.t SZXX.Xlsx.status SZXX.Xlsx.row State.t
+type state = ImportDataTypes.Value.t SZXX.Xlsx.status SZXX.Xlsx.row State.t
let delayed_mapper =
State.
{
get_value =
(function
- | SZXX.Xlsx.Available (CSV.DataType.Content s) ->
- CSV.DataType.Content (SZXX.Xml.unescape s)
+ | SZXX.Xlsx.Available (ImportDataTypes.Value.Content s) ->
+ ImportDataTypes.Value.Content (SZXX.Xml.unescape s)
| SZXX.Xlsx.Available value -> value
- | _ -> CSV.DataType.Null);
- default = SZXX.Xlsx.Available CSV.DataType.Null;
+ | _ -> ImportDataTypes.Value.Null);
+ default = SZXX.Xlsx.Available ImportDataTypes.Value.Null;
get_row = (fun v -> v.SZXX.Xlsx.data);
}
@@ -96,11 +98,11 @@ let first_row : A.t -> _ Db.t -> state -> 'a SZXX.Xlsx.row -> state =
let importInDatable :
log_error:Csv.out_channel Lazy.t ->
- conf:Syntax.t ->
+ conf:ImporterSyntax.t ->
dirname:string ->
A.t ->
'a Db.t ->
- CSV.DataType.t array option Lwt.t =
+ ImportDataTypes.Value.t array option Lwt.t =
fun ~log_error ~conf ~dirname mapping db ->
let file = Filename.concat dirname (A.table mapping).file in
diff --git a/lib/file_handler/xlsx2sql.mli b/lib/file_handler/xlsx2sql.mli
index e09737b..8976034 100644
--- a/lib/file_handler/xlsx2sql.mli
+++ b/lib/file_handler/xlsx2sql.mli
@@ -1,10 +1,10 @@
val importInDatable :
log_error:ImportErrors.t ->
- conf:ImportConf.Syntax.t ->
+ conf:ImporterSyntax.t ->
dirname:string ->
ImportAnalyser.Dependency.t ->
_ ImportSQL.Db.t ->
- ImportCSV.DataType.t array option Lwt.t
-(** Load an excel spreadsheet in an SQLite database.
+ ImportDataTypes.Value.t array option Lwt.t
+(** Load an excel spreadsheet in an SQLite database.
-Return the header if at least one row where present *)
+ Return the header if at least one row where present *)
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 19:02:16 +0000