" ^
- (* The following three lines to make Javascript create *)
- (* the constr_obj[] and obj_depth[] arrays even if we *)
- (* have only one real entry. *)
- "" ^
- "") ^
- (if must_rel = [] then "" else
- "
" ^
- (* The following two lines to make Javascript create *)
- (* the constr_rel[] and rel_depth[] arrays even if *)
- (* we have only one real entry. *)
- "" ^
- "") ^
- (if must_sort = [] then "" else
- "
" ^
- (* The following two lines to make Javascript create *)
- (* the constr_sort[] and sort_depth[] arrays even if *)
- (* we have only one real entry. *)
- "" ^
- "") ^
- "
Only constraints
" ^
- "Enforce Only constraints for objects: " ^
- " " ^
- "Enforce Rel constraints for objects: " ^
- " " ^
- "Enforce Sort constraints for objects: " ^
- " "
+ 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 ;
@@ -584,53 +451,121 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
(fun line ->
let processed_line =
apply_substs
- [form_RE, form ;
- variables_initialization_RE, variables] line
+ [interpretations_RE, html_interpretations;
+ interpretations_labels_RE, html_interpretations_labels]
+ line
in
output_string outchan (processed_line ^ "\n"))
- constraints_choice_TPL;
- raise Chat_unfinished)
- in
- let query =
- G.query_of_constraints (Some universe) must'' only'
- in
- let results = MQueryInterpreter.execute mqi_handle query in
- Http_daemon.send_basic_headers ~code:200 outchan ;
- Http_daemon.send_CRLF outchan ;
- iter_file
- (fun line ->
- let new_aliases =
- match id_to_uris' with
- | (domain, f) ->
- String.concat ", "
- (List.map
- (fun name ->
- sprintf "\'alias %s cic:%s\'"
- (match name with
- CicTextualParser0.Id name -> name
- | _ -> assert false (*CSC: completare *))
- (match f name with
- | None -> assert false
- | Some (CicTextualParser0.Uri t) ->
- MQueryMisc.string_of_cic_textual_parser_uri
- t
- | _ -> assert false (*CSC: completare *)))
- domain)
- in
- let processed_line =
- apply_substs
- [results_RE, theory_of_result results ;
- new_aliases_RE, new_aliases]
- line
- in
- output_string outchan (processed_line ^ "\n"))
- final_results_TPL
- | _ -> (* unable to instantiate some implicit variable *)
- Http_daemon.respond
- ~headers:[contype]
- ~body:"some implicit variables are still unistantiated :-("
- outchan);
- C.close mqi_handle
+ interactive_interpretation_choice_TPL;
+ raise Chat_unfinished
+
+ let input_or_locate_uri ~title ?id () =
+ assert false
+
+ end
+ 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
+ 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
+ "
" ^
+ (* The following three lines to make Javascript create *)
+ (* the constr_obj[] and obj_depth[] arrays even if we *)
+ (* have only one real entry. *)
+ "" ^
+ "") ^
+ (if must_rel = [] then "" else
+ "
" ^
+ (* The following two lines to make Javascript create *)
+ (* the constr_rel[] and rel_depth[] arrays even if *)
+ (* we have only one real entry. *)
+ "" ^
+ "") ^
+ (if must_sort = [] then "" else
+ "
" ^
+ (* The following two lines to make Javascript create *)
+ (* the constr_sort[] and sort_depth[] arrays even if *)
+ (* we have only one real entry. *)
+ "" ^
+ "") ^
+ "
Only constraints
" ^
+ "Enforce Only constraints for objects: " ^
+ " " ^
+ "Enforce Rel constraints for objects: " ^
+ " " ^
+ "Enforce Sort constraints for objects: " ^
+ " "
+ in
+ Http_daemon.send_basic_headers ~code:200 outchan ;
+ Http_daemon.send_CRLF outchan ;
+ iter_file
+ (fun line ->
+ let processed_line =
+ apply_substs
+ [form_RE, form ;
+ variables_initialization_RE, variables] line
+ in
+ output_string outchan (processed_line ^ "\n"))
+ constraints_choice_TPL;
+ raise Chat_unfinished)
+ in
+ let query =
+ G.query_of_constraints universe must'' only'
+ in
+ let results = MQueryInterpreter.execute mqi_handle query in
+ Http_daemon.send_basic_headers ~code:200 outchan ;
+ Http_daemon.send_CRLF outchan ;
+ iter_file
+ (fun line ->
+ let new_aliases =
+ DisambiguatingParser.EnvironmentP3.to_string id_to_uris' in
+ let processed_line =
+ apply_substs
+ [results_RE, theory_of_result results ;
+ (* CSC: Bug here: this is a string, not an array! *)
+ new_aliases_RE, "'" ^ javascript_quote new_aliases ^ "'"]
+ line
+ in
+ output_string outchan (processed_line ^ "\n"))
+ final_results_TPL
| invalid_request ->
Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan);
debug_print (sprintf "%s done!" req#path)
@@ -639,15 +574,16 @@ List.iter (fun u -> prerr_endline ("<" ^ Netencoding.Url.decode u ^ ">")) tail;
| Http_types.Param_not_found attr_name ->
bad_request (sprintf "Parameter '%s' is missing" attr_name) outchan
| exc ->
- Http_daemon.respond
- ~body:(pp_error ("Uncaught exception: " ^ (Printexc.to_string exc)))
- outchan
+ let msg = sprintf "Uncaught exception: %s" (Printexc.to_string exc) in
+ debug_print msg ;
+ Http_daemon.respond ~body:(pp_error msg) outchan
in
printf "%s started and listening on port %d\n" daemon_name port;
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
-