From d722be8a16e770467f4e886a99876fa27f5f4f95 Mon Sep 17 00:00:00 2001 From: Ushitora Anqou Date: Wed, 27 Sep 2023 22:49:37 +0900 Subject: [PATCH] Fix dump-data-json --- lib/verifier.ml | 8 ++++---- lib/web_server.ml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/verifier.ml b/lib/verifier.ml index b47b11a..a633fa3 100644 --- a/lib/verifier.ml +++ b/lib/verifier.ml @@ -36,7 +36,7 @@ let verify_balanced_transactions pool = |> Printf.sprintf "Unbalanced transactions:\n%s") else Ok () -let verify_notes pool notes = +let verify_notes ?(print = true) pool notes = Datastore.use pool @@ fun con -> try notes @@ -46,7 +46,7 @@ let verify_notes pool notes = match Datastore.(query (prepare con sql) []) with | Error msg -> failwithf "Error !show: %s\n" msg | Ok [] | Ok [ [ Null ] ] -> () - | Ok [ [ Text s ] ] -> Printf.printf "%s\n" s + | Ok [ [ Text s ] ] -> if print then Printf.printf "%s\n" s | _ -> failwithf "Error !show: invalid result:\n%s" sql) | Assert sql -> ( match Datastore.(query (prepare con sql) []) with @@ -57,8 +57,8 @@ let verify_notes pool notes = Ok () with Failure s -> Error s -let verify pool notes = +let verify ?print pool notes = let ( let* ) = Lwt_result.bind in let* () = verify_balanced_transactions pool in - let* () = verify_notes pool notes in + let* () = verify_notes ?print pool notes in Lwt.return_ok () diff --git a/lib/web_server.ml b/lib/web_server.ml index d616038..c668b53 100644 --- a/lib/web_server.ml +++ b/lib/web_server.ml @@ -545,7 +545,7 @@ let generate in_filename thn err = try%lwt let%lwt m, notes = Loader.load_file in_filename in Sql_writer.with_dump_file m @@ fun pool -> - match%lwt Verifier.verify pool notes with + match%lwt Verifier.verify ~print:false pool notes with | Error s -> failwithf "Verification error: %s" s | Ok () -> Lwt.finalize (fun () -> thn pool) (fun () -> Datastore.close_db pool)