-(* Copyright (C) 2002-2004, HELM Team.
+(* Copyright (C) 2002-2005, HELM Team.
*
* This file is part of HELM, an Hypertextual, Electronic
* Library of Mathematics, developed at the Computer Science
open Printf
-module DB = Dbi_mysql
-
let debug = true
let debug_print s = if debug then prerr_endline s
let _ = Http_common.debug := false
exception Invalid_action of string (* invalid action for "/search" method *)
let daemon_name = "Moogle"
-let configuration_file = "/projects/helm/etc/moogle.conf.xml"
+let configuration_file =
+ "/projects/helm/daemons/searchEngine.debug/moogle.conf.xml"
let placeholders = [
- "EXPRESSION"; "ACTION"; "ADVANCED"; "ADVANCED_CHECKED"; "SIMPLE_CHECKED";
- "TITLE"; "NO_CHOICES"; "CURRENT_CHOICES"; "CHOICES"; "MSG"; "ID_TO_URIS";
- "ID"; "IDEN"; "INTERPRETATIONS"; "INTERPRETATIONS_LABELS"; "RESULTS";
- "NEW_ALIASES"; "SEARCH_ENGINE_URL"; "PREV_LINK"; "PAGE"; "PAGES"; "NEXT_LINK"
+ "ACTION"; "ADVANCED"; "ADVANCED_CHECKED"; "CHOICES"; "CURRENT_CHOICES";
+ "EXPRESSION"; "ID"; "IDEN"; "ID_TO_URIS"; "INTERPRETATIONS";
+ "INTERPRETATIONS_LABELS"; "MSG"; "NEW_ALIASES"; "NEXT_LINK"; "NO_CHOICES";
+ "PAGE"; "PAGES"; "PREV_LINK"; "QUERY_KIND"; "QUERY_SUMMARY"; "RESULTS";
+ "SEARCH_ENGINE_URL"; "SIMPLE_CHECKED"; "TITLE";
]
let tag =
List.iter
(fun tag -> Hashtbl.add regexps tag (Pcre.regexp (sprintf "@%s@" tag)))
placeholders;
- Hashtbl.find regexps
+ fun name ->
+ try
+ Hashtbl.find regexps name
+ with Not_found -> assert false
(* First of all we load the configuration *)
let _ = Helm_registry.load_from configuration_file
let page_RE = Pcre.regexp "¶m\\.page=\\d+"
+let query_kind_of_req (req: Http_types.request) =
+ match req#path with
+ | "/match" -> "Match"
+ | "/hint" -> "Hint"
+ | "/locate" -> "Locate"
+ | "/elim" -> "Elim"
+ | _ -> assert false
+
let send_results results
?(id_to_uris = CicTextualParser2.EnvironmentP3.of_string "")
(req: Http_types.request) outchan
=
+ let query_kind = query_kind_of_req req in
let page_link anchor page =
try
let this = req#param "this" in
Http_daemon.send_basic_headers ~code:(`Code 200) outchan ;
Http_daemon.send_header "Content-Type" "text/xml" outchan;
Http_daemon.send_CRLF outchan ;
- let subst, results_string =
+ let subst =
match results with
| `Results results ->
let page = try int_of_string (req#param "page") with _ -> 1 in
else
results_no / results_per_page + 1
in
- ([ tag "PAGE", string_of_int page; tag "PAGES", string_of_int pages ] @
- [ tag "PREV_LINK",
- if page > 1 then page_link "Prev" (page-1) else "" ] @
- [ tag "NEXT_LINK",
- if page < pages then page_link "Next" (page+1) else "" ]),
- MooglePp.theory_of_result req page results
+ let pages = if pages = 0 then 1 else pages in
+ let (summary, results) = MooglePp.theory_of_result page results in
+ [ tag "PAGE", string_of_int page;
+ tag "PAGES", string_of_int pages;
+ tag "PREV_LINK", (if page > 1 then page_link "Prev" (page-1) else "");
+ tag "NEXT_LINK",
+ (if page < pages then page_link "Next" (page+1) else "");
+ tag "QUERY_KIND", query_kind;
+ tag "QUERY_SUMMARY", summary;
+ tag "RESULTS", results ]
| `Error msg ->
- [ tag "PAGE", ""; tag "PAGES", "";
- tag "PREV_LINK", ""; tag "NEXT_LINK", "" ],
- msg
+ [ tag "PAGE", "1";
+ tag "PAGES", "1";
+ tag "PREV_LINK", "";
+ tag "NEXT_LINK", "";
+ tag "QUERY_KIND", query_kind;
+ tag "QUERY_SUMMARY", "error";
+ tag "RESULTS", msg ]
+ in
+ let advanced =
+ try
+ req#param "advanced"
+ with Http_types.Param_not_found _ -> "no"
in
let subst =
(tag "SEARCH_ENGINE_URL", my_own_url) ::
- (tag "RESULTS", results_string) ::
- (tag "ADVANCED", req#param "advanced") ::
+ (tag "ADVANCED", advanced) ::
(tag "EXPRESSION", req#param "expression") ::
add_param_substs req#params @
- (if req#param "advanced" = "no" then
+ (if advanced = "no" then
[ tag "SIMPLE_CHECKED", "checked='true'";
tag "ADVANCED_CHECKED", "" ]
else
output_string outchan (processed_line ^ "\n"))
moogle_TPL
-let exec_action dbh (req: Http_types.request) outchan =
+let exec_action dbd (req: Http_types.request) outchan =
let term_str = req#param "expression" in
let (context, metasenv) = ([], []) in
let id_to_uris_raw =
in
Http_daemon.send_basic_headers ~code:(`Code 200) outchan ;
Http_daemon.send_CRLF outchan ;
+ let advanced =
+ try
+ req#param "advanced"
+ with Http_types.Param_not_found _ -> "no"
+ in
iter_file
(fun line ->
let processed_line =
apply_substs
- [tag "ADVANCED", req#param "advanced";
+ [tag "ADVANCED", advanced;
tag "INTERPRETATIONS", html_interpretations;
tag "CURRENT_CHOICES", req#param "choices";
tag "EXPRESSION", req#param "expression";
let ast = CicTextualParser2.parse_term (Stream.of_string term_str) in
let (id_to_uris, metasenv, term) =
match
- Disambiguate'.disambiguate_term dbh context metasenv ast id_to_uris
+ Disambiguate'.disambiguate_term dbd context metasenv ast id_to_uris
with
- | [id_to_uris,metasenv,term] -> id_to_uris,metasenv,term
+ | [id_to_uris,metasenv,term,_] -> id_to_uris,metasenv,term
| _ -> assert false
in
let uris =
match req#path with
- | "/match" -> MetadataQuery.match_term ~dbh term
+ | "/match" -> MetadataQuery.match_term ~dbd term
| "/hint" ->
let status = ProofEngineTypes.initial_status term metasenv in
let intros = PrimitiveTactics.intros_tac () in
(match subgoals with
| proof, [goal] ->
let (uri,metasenv,bo,ty) = proof in
- List.map fst (MetadataQuery.hint ~dbh (proof, goal))
+ List.map fst (MetadataQuery.hint ~dbd (proof, goal))
| _ -> assert false)
| "/elim" ->
let uri =
UriManager.string_of_uriref (uri, [typeno])
| _ -> assert false
in
- MetadataQuery.elim ~dbh uri
+ MetadataQuery.elim ~dbd uri
| _ -> assert false
in
send_results ~id_to_uris (`Results uris) req outchan
-let callback dbh (req: Http_types.request) outchan =
+let callback dbd (req: Http_types.request) outchan =
try
debug_print (sprintf "Received request: %s" req#path);
(match req#path with
in
if expression = "" then
send_results (`Results []) req outchan
- else
- let results = MetadataQuery.locate ~dbh expression in
+ else begin
+ let results = MetadataQuery.locate ~dbd expression in
send_results (`Results results) req outchan
+ end
| "/hint"
| "/elim"
- | "/match" -> exec_action dbh req outchan
+ | "/match" -> exec_action dbd req outchan
| invalid_request ->
Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request))
outchan);
| Chat_unfinished -> ()
| Http_types.Param_not_found attr_name ->
bad_request (sprintf "Parameter '%s' is missing" attr_name) outchan
- | CicTextualParser2.Parse_error msg ->
+ | CicTextualParser2.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
printf "HTML directory is %s\n" pages_dir;
flush stdout;
Unix.putenv "http_proxy" "";
- let dbh =
- new DB.connection ~host:(Helm_registry.get "db.host")
- ~user:(Helm_registry.get "db.user") (Helm_registry.get "db.database")
+ let dbd =
+ Mysql.quick_connect
+ ~host:(Helm_registry.get "db.host")
+ ~database:(Helm_registry.get "db.database")
+ ~user:(Helm_registry.get "db.user")
+ ()
in
- Http_daemon.start' ~port (callback dbh);
+ Http_daemon.start' ~port (callback dbd);
printf "%s is terminating, bye!\n" daemon_name