X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FsearchEngine%2FsearchEngine.ml;h=bfff6fd67d5a1a477d9c0101bf805b0d67b3030e;hb=db380975055d3e4bc3668adba56f693aa8f0968f;hp=f3690204f2cee7218b9902a363e56ee5948cdc55;hpb=bcec0bb27e0dce3e72c97011f9c9dd210f604705;p=helm.git
diff --git a/helm/searchEngine/searchEngine.ml b/helm/searchEngine/searchEngine.ml
index f3690204f..bfff6fd67 100644
--- a/helm/searchEngine/searchEngine.ml
+++ b/helm/searchEngine/searchEngine.ml
@@ -30,7 +30,7 @@ module C = MQIConn
open Http_types ;;
-let debug = false;;
+let debug = true;;
let debug_print s = if debug then prerr_endline s;;
Http_common.debug := true;;
(* Http_common.debug := true;; *)
@@ -59,6 +59,13 @@ let final_results_TPL = pages_dir ^ "/templateambigpdq3.html";;
exception Chat_unfinished
+let javascript_quote s =
+ let rex = Pcre.regexp "'" in
+ let rex' = Pcre.regexp "\"" in
+ Pcre.replace ~rex ~templ:"\\'"
+ (Pcre.replace ~rex:rex' ~templ:"\\\"" s)
+;;
+
(* build a bool from a 1-character-string *)
let bool_of_string' = function
| "0" -> false
@@ -342,23 +349,8 @@ let callback mqi_handle (req: Http_types.request) outchan =
let term_string = req#param "term" in
let (context, metasenv) = ([], []) 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
- | "alias" :: key :: value :: rest ->
- let key' = CicTextualParser0.Id key in
- parse_tokens
- (key'::keys)
- (fun id ->
- if id = key' then
- Some
- (CicTextualParser0.Uri (MQueryMisc.cic_textual_parser_uri_of_string value))
- else lookup id)
- rest
- | _ -> failwith "Can't parse aliases"
- in
-*)
+ let parse_interpretation_choices choices =
+ List.map int_of_string (Pcre.split ~pat:" " choices) in
let parse_choices choices_raw =
let choices = Pcre.split ~pat:";" choices_raw in
List.fold_left
@@ -377,14 +369,18 @@ let callback mqi_handle (req: Http_types.request) outchan =
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 interpretation_choices =
+ try
+ let choices_raw = req#param "interpretation_choices" in
+ Some (parse_interpretation_choices choices_raw)
+ with Http_types.Param_not_found _ -> None
+ in
let module Chat: DisambiguateTypes.Callbacks =
struct
@@ -422,48 +418,45 @@ print_endline ("id_to_uris: " ^ (DisambiguatingParser.EnvironmentP3.to_string id
raise Chat_unfinished))
let interactive_interpretation_choice interpretations =
- let html_interpretations_labels =
- String.concat ", "
- (List.map
- (fun l ->
- "\'" ^
- (String.concat "
"
- (List.map
- (fun (id, value) ->
- (sprintf "alias id %s = %s" id value))
- l)) ^
- "\'")
- interpretations)
- in
- let html_interpretations =
- String.concat ", "
- (List.map
- (fun l ->
- "\'" ^
- (String.concat " "
- (List.map
- (fun (id, value) ->
- (sprintf "alias id %s = %s"
- id
- (MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format'
- value)))
- l)) ^
- "\'")
+ match interpretation_choices with
+ Some l -> prerr_endline "CARRAMBA" ; l
+ | None ->
+ let html_interpretations_labels =
+ String.concat ", "
+ (List.map
+ (fun l ->
+ "\'" ^
+ (String.concat "
"
+ (List.map
+ (fun (id, value) ->
+ let id = javascript_quote id in
+ let value = javascript_quote value in
+ sprintf "%s = %s" id value)
+ l)) ^
+ "\'")
interpretations)
- in
- Http_daemon.send_basic_headers ~code:200 outchan ;
- Http_daemon.send_CRLF outchan ;
- iter_file
- (fun line ->
- let processed_line =
- apply_substs
- [interpretations_RE, html_interpretations;
- interpretations_labels_RE, html_interpretations_labels]
- line
- in
- output_string outchan (processed_line ^ "\n"))
- interactive_interpretation_choice_TPL;
- raise Chat_unfinished
+ in
+ let html_interpretations =
+ let rec aux n =
+ function
+ [] -> []
+ | _::tl -> ("'" ^ string_of_int n ^ "'")::(aux (n+1) tl)
+ in
+ String.concat ", " (aux 0 interpretations)
+ in
+ Http_daemon.send_basic_headers ~code:200 outchan ;
+ Http_daemon.send_CRLF outchan ;
+ iter_file
+ (fun line ->
+ let processed_line =
+ apply_substs
+ [interpretations_RE, html_interpretations;
+ interpretations_labels_RE, html_interpretations_labels]
+ line
+ in
+ output_string outchan (processed_line ^ "\n"))
+ interactive_interpretation_choice_TPL;
+ raise Chat_unfinished
let input_or_locate_uri ~title =
UriManager.uri_of_string "cic:/Coq/Init/DataTypes/nat_ind.con"
@@ -472,127 +465,106 @@ print_endline ("id_to_uris: " ^ (DisambiguatingParser.EnvironmentP3.to_string id
in
let module Disambiguate' = DisambiguatingParser.Make(Chat) in
let (id_to_uris', metasenv', term') =
+ 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
- | [] ->
- let universe,
- ((must_obj, must_rel, must_sort) as must'),
- ((only_obj, only_rel, only_sort) as only) =
- get_constraints term' req#path
- in
- let must'', only' =
- (try
- add_user_constraints
- ~constraints:(req#param "constraints")
- (must', only)
- with Http_types.Param_not_found _ ->
- let variables =
- "var aliases = '" ^ id_to_uris_raw ^ "';\n" ^
- "var constr_obj_len = " ^
- string_of_int (List.length must_obj) ^ ";\n" ^
- "var constr_rel_len = " ^
- string_of_int (List.length must_rel) ^ ";\n" ^
- "var constr_sort_len = " ^
- string_of_int (List.length must_sort) ^ ";\n" in
- let form =
- (if must_obj = [] then "" else
- "