follow libgrew

src_ocaml/grewpy.ml

@@ -166,17 +166,17 @@ let run_command request =
       begin
         try
           let corpus_index = json |> member "corpus_index" |> to_int in
-          let pattern = Grs.request_of_json ~config (json |> member "request") in
+          let request = Request.of_json ~config (json |> member "request") 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 request graph in
                   (List.map
                     (fun m -> `Assoc [
                       ("sent_id", `String id);
-                      ("matching", Matching.to_json pattern graph m)
+                      ("matching", Matching.to_json request graph m)
                       ]
                     ) matching_list
                   ) @ acc
@@ -195,12 +195,12 @@ let run_command request =
       begin
         try
           let corpus_index = json |> member "corpus_index" |> to_int in
-          let pattern = Grs.request_of_json ~config (json |> member "request") in
+          let request = Request.of_json ~config (json |> member "request") 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 request graph in
                  (List.length matching_list) + acc
               ) 0 corpus in
           Yojson.Basic.to_string