From e0827d3a7ddf80089660e804e9ea5443f6a90149 Mon Sep 17 00:00:00 2001 From: Bruno Guillaume <Bruno.Guillaume@loria.fr> Date: Wed, 2 Nov 2022 10:37:43 +0100 Subject: [PATCH] update corpus_search function --- src_ocaml/grewpy.ml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src_ocaml/grewpy.ml b/src_ocaml/grewpy.ml index 9a469c2..061ad6a 100644 --- a/src_ocaml/grewpy.ml +++ b/src_ocaml/grewpy.ml @@ -166,20 +166,20 @@ let run_command request = begin try let corpus_index = json |> member "corpus_index" |> to_int in - let string_pattern = json |> member "pattern" |> to_string in - let pattern = Pattern.parse ~config string_pattern in + let pattern = Grs.request_of_json ~config (json |> member "request") in let corpus = Global.corpus_get corpus_index in - let matches = Array.fold_left + let matches = + Array.fold_left (fun acc (id,graph) -> - let matching_list = Matching.search_pattern_in_graph ~config pattern graph in - (List.map + let matching_list = Matching.search_pattern_in_graph ~config pattern graph in + (List.map (fun m -> `Assoc [ - ("sent_id", `String id); - ("matching", Matching.to_json pattern graph m) - ] + ("sent_id", `String id); + ("matching", Matching.to_json pattern graph m) + ] ) matching_list - ) @ acc + ) @ acc ) [] corpus in Yojson.Basic.to_string (`Assoc [ -- GitLab