X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=daemons%2Fwhelp%2FsearchEngine.ml;h=8524588ca76ea9b4c557ca266242c2ed98f6a390;hb=baf2bf939ffa6b9bbba8c3f3d59737096e723d8d;hp=26c1def3e60c6c7cbb4cd405829136993420f7b4;hpb=28eef5b98d64d50e0c593a538f5eacb6279d395b;p=helm.git

diff --git a/daemons/whelp/searchEngine.ml b/daemons/whelp/searchEngine.ml
index 26c1def3e..8524588ca 100644
--- a/daemons/whelp/searchEngine.ml
+++ b/daemons/whelp/searchEngine.ml
@@ -357,7 +357,8 @@ let exec_action dbd (req: Http_types.request) outchan =
       end
     in
     let module Disambiguate' = Disambiguate.Make(Chat) in
-    let ast = Grammar.Entry.parse CicNotationParser.term (Stream.of_string term_str) in
+    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
@@ -466,6 +467,11 @@ let callback dbd (req: Http_types.request) outchan =
       bad_request (sprintf "Parameter '%s' is missing" attr_name) outchan
   | CicNotationParser.Parse_error msg ->
       send_results (`Error (MooglePp.pp_error "Parse error" msg)) req outchan
+  | Stdpp.Exc_located (floc, Stream.Error msg) ->
+      send_results (`Error (MooglePp.pp_error "Parse error" msg)) req outchan
+  | Stdpp.Exc_located (floc, exn) ->
+      let msg = Printexc.to_string exn in
+      send_results (`Error (MooglePp.pp_error "Unknown error" msg)) req outchan
   | Unbound_identifier id ->
       send_results (`Error (MooglePp.pp_error "Unbound identifier" id)) req
         outchan
@@ -488,11 +494,10 @@ let restore_environment () =
       printf "done!\n"; flush stdout
 
 let read_notation () =
-  let _ = assert false in ()
-  (*
-  CicNotation.load_notation (Helm_registry.get "search_engine.notations");
-  CicNotation.load_notation (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;
@@ -509,6 +514,7 @@ let _ =
   in
   restore_environment ();
   read_notation ();
-  Http_daemon.start' ~port (callback dbd);
+  let d_spec = Http_daemon.daemon_spec ~port ~callback:(callback dbd) ~auto_close:true () in
+  Http_daemon.main d_spec;
   printf "%s is terminating, bye!\n" daemon_name