MathQL query generator: new interface

[helm.git] / helm / searchEngine / searchEngine.ml

diff --git a/helm/searchEngine/searchEngine.ml b/helm/searchEngine/searchEngine.ml
index b7c24137194a297fb204f75a13dc6dbb8c1a87d3..ecedf5ab7635a24dcef27f968d41fb2b2f4b0215 100644 (file)
--- a/helm/searchEngine/searchEngine.ml
+++ b/helm/searchEngine/searchEngine.ml
@@ -303,14 +303,15 @@ let callback (req: Http_types.request) outchan =
         let query_string = req#param "query" in
         let lexbuf = Lexing.from_string query_string in
         let query = MQueryUtil.query_of_text lexbuf in
-        let result = MQueryGenerator.execute_query mqi_handle query in
+        let result = MQueryInterpreter.execute mqi_handle query in
         let result_string = pp_result result in
              MQIConn.close mqi_handle;
         Http_daemon.respond ~body:result_string ~headers:[contype] outchan
     | "/locate" ->
         let mqi_handle = MQIConn.init mqi_flags debug_print in
         let id = req#param "id" in
-        let result = MQueryGenerator.locate mqi_handle id in
+        let query = MQueryGenerator.locate id in
+       let result = MQueryInterpreter.execute mqi_handle query in
              MQIConn.close mqi_handle;
         Http_daemon.respond ~headers:[contype] ~body:(pp_result result) outchan
     | "/getpage" ->
@@ -591,8 +592,8 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
                   constraints_choice_TPL;
                   raise Chat_unfinished)
             in
-            let results =
-             MQueryGenerator.searchPattern mqi_handle must'' only' in 
+            let query = MQueryGenerator.searchPattern must'' only' in
+           let results = MQueryInterpreter.execute mqi_handle query in 
             Http_daemon.send_basic_headers ~code:200 outchan ;
             Http_daemon.send_CRLF outchan ;
             iter_file