X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FsearchEngine%2FsearchEngine.ml;h=2d8a7067c5fbe5e4edcd2df82ee1a0c7c7a1b43e;hb=8751721d61afcf2da67cb2ebdd70bb3e07aba551;hp=a140666aca5d3d2434f78bcd6d3bac75592ed246;hpb=9d04d8c478c68127fade09c220e983adbf492c15;p=helm.git
diff --git a/helm/searchEngine/searchEngine.ml b/helm/searchEngine/searchEngine.ml
index a140666ac..2d8a7067c 100644
--- a/helm/searchEngine/searchEngine.ml
+++ b/helm/searchEngine/searchEngine.ml
@@ -30,28 +30,27 @@ module C = MQIConn
open Http_types ;;
-let debug = true;;
+let debug = false;;
let debug_print s = if debug then prerr_endline s;;
Http_common.debug := true;;
(* Http_common.debug := true;; *)
- (** accepted HTTP servers for ask_uwobo method forwarding *)
-let valid_servers =
- [ "mowgli.cs.unibo.it:58080" ; "mowgli.cs.unibo.it" ; "localhost:58080" ];;
-
-let mqi_flags = [] (* default MathQL interpreter options *)
-
open Printf;;
let daemon_name = "Search Engine";;
-let default_port = 58085;;
-let port_env_var = "SEARCH_ENGINE_PORT";;
-let pages_dir =
- try
- Sys.getenv "SEARCH_ENGINE_HTML_DIR"
- with Not_found -> "html" (* relative to searchEngine's document root *)
+ (* First of all we load the configuration *)
+let _ =
+ let configuration_file = "/projects/helm/etc/searchEngine.conf.xml" in
+ Helm_registry.load_from configuration_file
;;
+
+let pages_dir = Helm_registry.get "search_engine.html_dir";;
+
+ (** accepted HTTP servers for ask_uwobo method forwarding *)
+let valid_servers= Helm_registry.get_string_list "search_engine.valid_servers";;
+
+
let interactive_user_uri_choice_TPL = pages_dir ^ "/templateambigpdq1.html";;
let interactive_interpretation_choice_TPL =
pages_dir ^ "/templateambigpdq2.html";;
@@ -155,15 +154,7 @@ let (title_tag_RE, choices_tag_RE, msg_tag_RE, id_to_uris_RE, id_RE,
Pcre.regexp "@VARIABLES_INITIALIZATION@")
let server_and_port_url_RE = Pcre.regexp "^http://([^/]+)/.*$"
-let port =
- try
- int_of_string (Sys.getenv port_env_var)
- with
- | Not_found -> default_port
- | Failure "int_of_string" ->
- prerr_endline "Warning: invalid port, reverting to default";
- default_port
-;;
+let port = Helm_registry.get_int "search_engine.port";;
let pp_error = sprintf "Error: %s
";;
@@ -271,33 +262,27 @@ in
(* HTTP DAEMON CALLBACK *)
-let callback (req: Http_types.request) outchan =
+let callback mqi_handle (req: Http_types.request) outchan =
try
debug_print (sprintf "Received request: %s" req#path);
(match req#path with
| "/execute" ->
- let mqi_handle = C.init mqi_flags debug_print in
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 = MQueryInterpreter.execute mqi_handle query in
let result_string = pp_result result in
- C.close mqi_handle;
Http_daemon.respond ~body:result_string ~headers:[contype] outchan
| "/locate" ->
- let mqi_handle = C.init mqi_flags debug_print in
let id = req#param "id" in
let query = G.locate id in
- let result = MQueryInterpreter.execute mqi_handle query in
- C.close mqi_handle;
+ let result = MQueryInterpreter.execute mqi_handle query in
Http_daemon.respond ~headers:[contype] ~body:(pp_result result) outchan
| "/unreferred" ->
- let mqi_handle = C.init mqi_flags debug_print in
let target = req#param "target" in
let source = req#param "source" in
- let query = G.unreferred target source in
- let result = MQueryInterpreter.execute mqi_handle query in
- C.close mqi_handle;
+ let query = G.unreferred target source in
+ let result = MQueryInterpreter.execute mqi_handle query in
Http_daemon.respond ~headers:[contype] ~body:(pp_result result) outchan
| "/getpage" ->
(* TODO implement "is_permitted" *)
@@ -354,15 +339,10 @@ let callback (req: Http_types.request) outchan =
| "/searchPattern"
| "/matchConclusion"
| "/locateInductivePrinciple" ->
- let mqi_handle = C.init mqi_flags debug_print in
let term_string = req#param "term" in
- let lexbuf = Lexing.from_string term_string in
let (context, metasenv) = ([], []) in
- let (dom, mk_metasenv_and_expr) =
- CicTextualParserContext.main
- ~context ~metasenv CicTextualLexer.token lexbuf
- in
let id_to_uris_raw = req#param "aliases" in
+(*XXX
let tokens = Pcre.split ~pat:"\\s" id_to_uris_raw in
let rec parse_tokens keys lookup = function (* TODO spostarla fuori *)
| [] -> keys, lookup
@@ -378,6 +358,7 @@ let callback (req: Http_types.request) outchan =
rest
| _ -> failwith "Can't parse aliases"
in
+*)
let parse_choices choices_raw =
let choices = Pcre.split ~pat:";" choices_raw in
List.fold_left
@@ -386,8 +367,6 @@ let callback (req: Http_types.request) outchan =
| ""::id::tail
| id::tail when id<>"" ->
(fun id' ->
-prerr_endline ("#### " ^ id ^ " :=");
-List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
if id = id' then
Some (List.map (fun u -> Netencoding.Url.decode u) tail)
else
@@ -396,34 +375,19 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
(fun _ -> None)
choices
in
- let (id_to_uris : Disambiguate.domain_and_interpretation) =
- parse_tokens [] (fun _ -> None) tokens in
+ let id_to_uris =
+ DisambiguatingParser.EnvironmentP3.of_string id_to_uris_raw in
+print_endline ("id_to_uris_raw: " ^ id_to_uris_raw) ;
+print_endline ("id_to_uris: " ^ (DisambiguatingParser.EnvironmentP3.to_string id_to_uris)) ;
let id_to_choices =
try
let choices_raw = req#param "choices" in
parse_choices choices_raw
with Http_types.Param_not_found _ -> (fun _ -> None)
in
- let module Chat: Disambiguate.Callbacks =
+ let module Chat: DisambiguateTypes.Callbacks =
struct
- let get_metasenv () =
- !CicTextualParser0.metasenv
-
- let set_metasenv metasenv =
- CicTextualParser0.metasenv := metasenv
-
- let output_html ?(append_NL = true) html_msg =
- let rec collect_string = function
- | `BR -> "\n"
- | `T s -> s
- | `L tags -> String.concat "" (List.map collect_string tags)
- in
- match html_msg with
- | `Error msg | `Msg msg ->
- (if append_NL then prerr_endline else prerr_string)
- (collect_string msg ^ (if append_NL then "\n" else ""))
-
let interactive_user_uri_choice
~selection_mode ?ok
?enable_button_for_non_vars ~(title: string) ~(msg: string)
@@ -466,7 +430,7 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
(String.concat "
"
(List.map
(fun (id, value) ->
- (sprintf "alias %s %s" id value))
+ (sprintf "alias id %s = %s" id value))
l)) ^
"\'")
interpretations)
@@ -479,7 +443,7 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
(String.concat " "
(List.map
(fun (id, value) ->
- (sprintf "alias %s %s"
+ (sprintf "alias id %s = %s"
id
(MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format'
value)))
@@ -506,10 +470,14 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
end
in
- let module Disambiguate' = Disambiguate.Make (Chat) in
+ let module Disambiguate' = DisambiguatingParser.Make(Chat) in
let (id_to_uris', metasenv', term') =
- Disambiguate'.disambiguate_input mqi_handle
- context metasenv dom mk_metasenv_and_expr id_to_uris
+ match
+ Disambiguate'.disambiguate_term mqi_handle
+ context metasenv term_string id_to_uris
+ with
+ [id_to_uris',metasenv',term'] -> id_to_uris',metasenv',term'
+ | _ -> assert false
in
(match metasenv' with
| [] ->
@@ -596,6 +564,8 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
iter_file
(fun line ->
let new_aliases =
+ DisambiguatingParser.EnvironmentP3.to_string id_to_uris' in
+(*XXX
match id_to_uris' with
| (domain, f) ->
String.concat ", "
@@ -613,6 +583,7 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
| _ -> assert false (*CSC: completare *)))
domain)
in
+*)
let processed_line =
apply_substs
[results_RE, theory_of_result results ;
@@ -625,8 +596,7 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
Http_daemon.respond
~headers:[contype]
~body:"some implicit variables are still unistantiated :-("
- outchan);
- C.close mqi_handle
+ outchan)
| invalid_request ->
Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan);
debug_print (sprintf "%s done!" req#path)
@@ -644,6 +614,7 @@ printf "Current directory is %s\n" (Sys.getcwd ());
printf "HTML directory is %s\n" pages_dir;
flush stdout;
Unix.putenv "http_proxy" "";
-Http_daemon.start' ~port callback;
+let mqi_handle = C.init ~log:debug_print () in
+Http_daemon.start' ~port (callback mqi_handle);
+C.close mqi_handle;
printf "%s is terminating, bye!\n" daemon_name
-