open Printf;;
+let postgresConnectionString =
+ try
+ Sys.getenv "POSTGRESQL_CONNECTION_STRING"
+ with
+ Not_found -> "host=mowgli.cs.unibo.it dbname=helm_mowgli_new_schema user=helm"
+;;
+
let daemon_name = "Search Engine";;
let default_port = 58085;;
let port_env_var = "SEARCH_ENGINE_PORT";;
exception Chat_unfinished
+ (** pretty print a MathQL query result to a string *)
+let text_of_result result sep =
+ let res_string = ref "" in
+ let app = function s -> res_string := !res_string ^ s in
+ MQueryUtil.text_of_result app result sep ;
+ !res_string
+;;
+
(** chain application of Pcre substitutions *)
let rec apply_substs substs line =
match substs with
default_port
in
let pp_result result =
- let result_string = MQueryUtil.text_of_result result "\n" in
+ let res_string = text_of_result result "\n" in
(sprintf "<html>\n<head>\n</head>\n<body>\n<pre>%s</pre>\n</body>\n</html>"
- result_string)
+ res_string)
in
let pp_error = sprintf "<html><body><h1>Error: %s</h1></body></html>" in
let bad_request body outchan =
let lexbuf = Lexing.from_string query_string in
let query = MQueryUtil.query_of_text lexbuf in
let result = MQueryGenerator.execute_query query in
- let result_string = MQueryUtil.text_of_result result "\n" in
+ let result_string = text_of_result result "\n" in
Http_daemon.respond
~body:
(sprintf "<html><body><pre>%s</pre></body></html>" result_string)
match page with
| page when is_permitted page ->
Http_daemon.respond_file
- ~fname:(sprintf "%s/%s" pages_dir page) outchan
+ ~fname:(sprintf "%s/%s" pages_dir (remove_fragment page)) outchan
| page -> Http_daemon.respond_forbidden ~url:page outchan)
| "/searchPattern" ->
let term_string = req#param "term" in
(key::keys)
(fun id ->
if id = key then
- Some (Disambiguate.cic_textual_parser_uri_of_string value)
+ Some (MQueryMisc.cic_textual_parser_uri_of_string value)
else lookup id)
rest
| _ -> failwith "Can't parse aliases"
(fun (id, value) ->
(sprintf "alias %s %s"
id
- (Disambiguate.wrong_xpointer_format_from_wrong_xpointer_format'
+ (MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format'
value)))
l)) ^
"\"")
(match f name with
| None -> assert false
| Some t ->
- Disambiguate.string_of_cic_textual_parser_uri
+ MQueryMisc.string_of_cic_textual_parser_uri
t))
domain)
in
let processed_line =
apply_substs
- [results_RE, MQueryUtil.text_of_result results "\n";
+ [results_RE, text_of_result results "\n";
new_aliases_RE, new_aliases]
line
in
flush stdout;
Unix.putenv "http_proxy" "";
Mqint.set_database Mqint.postgres_db;
-Mqint.init "host=mowgli.cs.unibo.it dbname=helm_mowgli_new_schema user=helm";
+Mqint.init postgresConnectionString;
Http_daemon.start' ~port callback;
Mqint.close ();
printf "%s is terminating, bye!\n" daemon_name
projects / helm.git / commitdiff