few more bits for zack

diff --git a/daemons/whelp/searchEngine.conf.xml.sample b/daemons/whelp/searchEngine.conf.xml.sample
index 6d646020f7fef7da2fdd1b57c069f1e33758a8c6..06e825e3906b2bd8a3b946a17931d594511eca33 100644 (file)
--- a/daemons/whelp/searchEngine.conf.xml.sample
+++ b/daemons/whelp/searchEngine.conf.xml.sample
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <helm_registry>
   <section name="db">
+    <key name="nodb">false</key>
     <key name="host">mowgli.cs.unibo.it</key>
     <key name="user">helm</key>
     <key name="database">mowgli</key>

diff --git a/daemons/whelp/searchEngine.ml b/daemons/whelp/searchEngine.ml
index 26c1def3e60c6c7cbb4cd405829136993420f7b4..e98bfe3567bf3ae10ad9fc30a6e76417d5c2f948 100644 (file)
--- a/daemons/whelp/searchEngine.ml
+++ b/daemons/whelp/searchEngine.ml
@@ -357,7 +357,9 @@ 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 (id_to_uris, metasenv, term) =
       match
         Disambiguate'.disambiguate_term ~dbd ~context ~metasenv
@@ -466,6 +468,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 +495,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")
-  *)
+  CicNotation2.load_notation ~include_paths:[]
+   (Helm_registry.get "search_engine.notations");
+   CicNotation2.load_notation ~include_paths:[]
+    (Helm_registry.get "search_engine.interpretations")
   
 let _ =
   printf "%s started and listening on port %d\n" daemon_name port;