matita.txt updated

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

diff --git a/daemons/whelp/searchEngine.ml b/daemons/whelp/searchEngine.ml
index e98bfe3567bf3ae10ad9fc30a6e76417d5c2f948..fc49116196d4cb96ff0518d43527e76ab27ef753 100644 (file)
--- a/daemons/whelp/searchEngine.ml
+++ b/daemons/whelp/searchEngine.ml
@@ -357,9 +357,8 @@ let exec_action dbd (req: Http_types.request) outchan =
       end
     in
     let module Disambiguate' = Disambiguate.Make(Chat) in
-prerr_endline "VOVI";
-    let ast = Grammar.Entry.parse CicNotationParser.term (Stream.of_string term_str) in
-prerr_endline "VIVO";
+    let ast =
+      CicNotationParser.parse_term (Ulexing.from_utf8_string term_str) in
     let (id_to_uris, metasenv, term) =
       match
         Disambiguate'.disambiguate_term ~dbd ~context ~metasenv
@@ -404,7 +403,7 @@ prerr_endline "VIVO";
          ^ " type")))
         req outchan
 
-let callback dbd (req: Http_types.request) outchan =
+let callback (dbd, (req: Http_types.request), outchan) =
   try
     debug_print (sprintf "Received request: %s" req#path);
     (match req#path with
@@ -482,6 +481,11 @@ let callback dbd (req: Http_types.request) outchan =
       let msg = MooglePp.pp_error "Uncaught exception" exn_string in
       send_results (`Error msg) req outchan
 
+let callback dbd req ch =
+  HExtlib.finally
+    (fun () -> try close_out ch with Sys_error _ -> ())
+    callback (dbd, req, ch)
+
 let restore_environment () =
   match
     Helm_registry.get_opt Helm_registry.string "search_engine.environment_dump"
@@ -495,10 +499,10 @@ let restore_environment () =
       printf "done!\n"; flush stdout
 
 let read_notation () =
-  CicNotation2.load_notation ~include_paths:[]
-   (Helm_registry.get "search_engine.notations");
-   CicNotation2.load_notation ~include_paths:[]
-    (Helm_registry.get "search_engine.interpretations")
+  ignore (CicNotation2.load_notation ~include_paths:[]
+   (Helm_registry.get "search_engine.notations"));
+  ignore (CicNotation2.load_notation ~include_paths:[]
+   (Helm_registry.get "search_engine.interpretations"))
   
 let _ =
   printf "%s started and listening on port %d\n" daemon_name port;
@@ -515,6 +519,7 @@ let _ =
   in
   restore_environment ();
   read_notation ();
-  Http_daemon.start' ~port (callback dbd);
+  let d_spec = Http_daemon.daemon_spec ~port ~callback:(callback dbd) () in
+  Http_daemon.main d_spec;
   printf "%s is terminating, bye!\n" daemon_name