From ab4ce810f08daaf2c5c64e8d6d97cf0bd802f92a Mon Sep 17 00:00:00 2001
From: Bruno Guillaume <Bruno.Guillaume@loria.fr>
Date: Wed, 12 Oct 2022 08:35:44 +0200
Subject: [PATCH] new to_json function from libcaml-grew
---
src_ocaml/grewpy.ml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src_ocaml/grewpy.ml b/src_ocaml/grewpy.ml
index 1c9fadb..f4e4ab8 100644
--- a/src_ocaml/grewpy.ml
+++ b/src_ocaml/grewpy.ml
@@ -52,7 +52,7 @@ let run_command request =
match json |> member "filename" |> to_string_option with
| Some filename ->
let graph = Graph.load ~config filename in
- let data = Graph.to_json_python ~config graph in
+ let data = Graph.to_json graph in
Yojson.Basic.to_string (`Assoc [("status", `String "OK"); ("data", data)])
| None -> json_error "no 'filename' in 'load_graph' command"
end
@@ -65,7 +65,7 @@ let run_command request =
json |> member "filename" |> to_string_option
) with
| Some graph, Some filename ->
- let gr = Graph.of_json_python ~config (Yojson.Basic.from_string graph) in
+ let gr = Graph.of_json (Yojson.Basic.from_string graph) in
Yojson.Basic.to_file filename (Graph.to_json gr);
Yojson.Basic.to_string (`Assoc [("status", `String "OK"); ("data", `Null)])
| _ -> json_error "incomplete 'save_graph' command"
@@ -120,7 +120,7 @@ let run_command request =
| (_, Some pos) -> pos
| (None, None) -> raise (Error "neither sent_id or pos in the request") in
let graph = snd corpus.(position) in
- let data = Graph.to_json_python ~config graph in
+ let data = Graph.to_json graph in
Yojson.Basic.to_string (`Assoc [("status", `String "OK"); ("data", data)])
with
| Error msg -> json_error msg
@@ -204,7 +204,7 @@ let run_command request =
json |> member "pattern" |> to_string_option
) with
| Some graph, Some string_pattern ->
- let gr = Graph.of_json_python ~config (Yojson.Basic.from_string graph) in
+ 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 json_list = List.map (fun m -> Matching.to_json pattern gr m) matching_list in
@@ -221,13 +221,13 @@ let run_command request =
json |> member "strat" |> to_string_option
) with
| Some graph, Some grs_index, Some strat ->
- let gr = Graph.of_json_python ~config (Yojson.Basic.from_string graph) in
+ let gr = Graph.of_json (Yojson.Basic.from_string graph) in
let grs = try Global.grs_get grs_index with Not_found -> raise (Error "Reference to an undefined GRS") in
let graph_list = Rewrite.simple_rewrite ~config gr grs strat in
Yojson.Basic.to_string
(`Assoc [
("status", `String "OK");
- ("data", `List (List.map (Graph.to_json_python ~config) graph_list))
+ ("data", `List (List.map Graph.to_json graph_list))
])
| _ -> json_error "incomplete 'run' command"
end
@@ -241,7 +241,7 @@ let run_command request =
Yojson.Basic.to_string
(`Assoc [
("status", `String "OK");
- ("data", Grs.to_json_python ~config grs)
+ ("data", Grs.to_json ~config grs)
])
| _ -> json_error "incomplete 'json_grs' command"
end
@@ -251,7 +251,7 @@ let run_command request =
begin
match json |> member "graph" |> to_string_option with
| Some graph ->
- let gr = Graph.of_json_python ~config (Yojson.Basic.from_string graph) in
+ let gr = Graph.of_json (Yojson.Basic.from_string graph) in
let dot = Graph.to_dot ~config gr in
let png_file = Utils.dot_to_png dot in
Yojson.Basic.to_string
@@ -267,7 +267,7 @@ let run_command request =
begin
match json |> member "graph" |> to_string_option with
| Some graph ->
- let gr = Graph.of_json_python ~config (Yojson.Basic.from_string graph) in
+ let gr = Graph.of_json (Yojson.Basic.from_string graph) in
let dep = Graph.to_dep ~config gr in
let png_file = Utils.dep_to_png dep in
Yojson.Basic.to_string
@@ -283,7 +283,7 @@ let run_command request =
begin
match json |> member "graph" |> to_string_option with
| Some graph ->
- let gr = Graph.of_json_python ~config (Yojson.Basic.from_string graph) in
+ let gr = Graph.of_json (Yojson.Basic.from_string graph) in
let svg_file = Utils.dep_to_svg (Graph.to_dep ~config gr) in
Yojson.Basic.to_string
(`Assoc [
--
GitLab