diff --git a/src_ocaml/grewpy.ml b/src_ocaml/grewpy.ml index f4e4ab8db9b3400030ea41439eff85298e39d6d0..1fa39ee575a6a63401acad4c06d5d7c9134b1248 100644 --- a/src_ocaml/grewpy.ml +++ b/src_ocaml/grewpy.ml @@ -153,12 +153,12 @@ let run_command request = 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 = Request.parse ~config string_pattern in let corpus = Global.corpus_get corpus_index in let matches = Array.fold_left (fun acc (id,graph) -> - let matching_list = Matching.search_pattern_in_graph ~config pattern graph in + let matching_list = Matching.search_request_in_graph ~config pattern graph in (List.map (fun m -> `Assoc [ ("sent_id", `String id); @@ -182,12 +182,12 @@ let run_command request = 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 = Request.parse ~config string_pattern in let corpus = Global.corpus_get corpus_index in let count = Array.fold_left (fun acc (id,graph) -> - let matching_list = Matching.search_pattern_in_graph ~config pattern graph in + let matching_list = Matching.search_request_in_graph ~config pattern graph in (List.length matching_list) + acc ) 0 corpus in Yojson.Basic.to_string @@ -205,8 +205,8 @@ let run_command request = ) with | Some graph, Some string_pattern -> let gr = Graph.of_json (Yojson.Basic.from_string graph) in - let pattern = Pattern.parse ~config string_pattern in - let matching_list = Matching.search_pattern_in_graph ~config pattern gr in + let pattern = Request.parse ~config string_pattern in + let matching_list = Matching.search_request_in_graph ~config pattern gr in let json_list = List.map (fun m -> Matching.to_json pattern gr m) matching_list in Yojson.Basic.to_string (`Assoc [("status", `String "OK"); ("data", `List (json_list))]) | _ -> json_error "incomplete 'search' command"