aux acc n
let send_results results
- ?(id_to_uris = CicTextualParser2.EnvironmentP3.of_string "")
+ ?(id_to_uris = DisambiguateTypes.empty_environment)
(req: Http_types.request) outchan
=
let query_kind = query_kind_of_req req in
in
iter_file
(fun line ->
- let new_aliases =
- CicTextualParser2.EnvironmentP3.to_string id_to_uris
- in
+ let new_aliases = DisambiguatePp.pp_environment id_to_uris in
let processed_line =
apply_substs
(* CSC: Bug here: this is a string, not an array! *)
(fun _ -> None)
choices
in
- let id_to_uris = CicTextualParser2.EnvironmentP3.of_string id_to_uris_raw in
+ let id_to_uris = DisambiguatePp.parse_environment id_to_uris_raw in
let id_to_choices =
try
parse_choices (req#param "choices")
end
in
let module Disambiguate' = Disambiguate.Make(Chat) in
- let ast = CicTextualParser2.parse_term (Stream.of_string term_str) in
+ let ast = Grammar.Entry.parse CicNotationParser.term (Stream.of_string term_str) in
let (id_to_uris, metasenv, term) =
match
Disambiguate'.disambiguate_term ~dbd ~context ~metasenv
let uri =
match term with
| Cic.MutInd (uri, typeno, _) ->
- UriManager.uri_of_string
- (UriManager.string_of_uriref (uri, [typeno]))
+ UriManager.uri_of_uriref uri typeno None
| _ -> raise Not_a_MutInd
in
MetadataQuery.elim ~dbd uri
| Chat_unfinished -> ()
| Http_types.Param_not_found attr_name ->
bad_request (sprintf "Parameter '%s' is missing" attr_name) outchan
- | CicTextualParser2.Parse_error (_, msg) ->
+ | CicNotationParser.Parse_error (_, msg) ->
send_results (`Error (MooglePp.pp_error "Parse error" msg)) req outchan
| Unbound_identifier id ->
send_results (`Error (MooglePp.pp_error "Unbound identifier" id)) req
close_in ic;
printf "done!\n"; flush stdout
+let read_notation () =
+ CicNotation.load_notation (Helm_registry.get "search_engine.notations");
+ CicNotation.load_notation (Helm_registry.get "search_engine.interpretations")
+
let _ =
printf "%s started and listening on port %d\n" daemon_name port;
printf "Current directory is %s\n" (Sys.getcwd ());
()
in
restore_environment ();
+ read_notation ();
Http_daemon.start' ~port (callback dbd);
printf "%s is terminating, bye!\n" daemon_name