X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter.ml;h=0792d30b52a8a58ada989efe6570d3f01ab30dcd;hb=60f8a4de1287ea04ee5722460bdc6ff16a3eb4be;hp=26b0774a49bc76fdb343486612173ae4919a1222;hpb=9c4e8b582be9e83f1cef8eeb31bde1af907b195e;p=helm.git
diff --git a/helm/http_getter/http_getter.ml b/helm/http_getter/http_getter.ml
index 26b0774a4..0792d30b5 100644
--- a/helm/http_getter/http_getter.ml
+++ b/helm/http_getter/http_getter.ml
@@ -71,16 +71,21 @@ let parse_output_format (req: Http_types.request) =
let parse_ls_uri =
let parse_ls_RE = Pcre.regexp "^(\\w+):(.*)$" in
let trailing_slash_RE = Pcre.regexp "/+$" in
+ let wrong_uri uri =
+ raise (Http_getter_bad_request ("Invalid /ls baseuri: " ^ uri))
+ in
fun (req: Http_types.request) ->
let baseuri = req#param "baseuri" in
- let subs =
- Pcre.extract ~rex:parse_ls_RE
- (Pcre.replace ~rex:trailing_slash_RE baseuri)
- in
- match (subs.(1), subs.(2)) with
- | "cic", uri -> Cic uri
- | "theory", uri -> Theory uri
- | _ -> raise (Http_getter_bad_request ("Invalid /ls baseuri: " ^ baseuri))
+ try
+ let subs =
+ Pcre.extract ~rex:parse_ls_RE
+ (Pcre.replace ~rex:trailing_slash_RE baseuri)
+ in
+ (match (subs.(1), subs.(2)) with
+ | "cic", uri -> Cic uri
+ | "theory", uri -> Theory uri
+ | _ -> wrong_uri baseuri)
+ with Not_found -> wrong_uri baseuri
;;
(* global maps, shared by all threads *)
@@ -105,7 +110,10 @@ let resolve uri =
with Http_getter_map.Key_not_found _ ->
raise (Http_getter_unresolvable_URI uri)
in
-let register uri = (map_of_uri uri )#add uri in
+let register uri =
+ (* Warning: this fail if uri is already registered *)
+ (map_of_uri uri)#add uri
+in
let return_all_foo_uris map doctype filter outchan =
(** return all URIs contained in 'map' which satisfy predicate 'filter'; URIs
are written in an XMLish format ('doctype' is the XML doctype) onto 'outchan'
@@ -290,10 +298,12 @@ let update_from_server logmsg server_url = (* use global maps *)
(match Pcre.split ~rex:index_line_sep_RE l with
| [uri; "gz"] ->
assert (is_cic_uri uri || is_nuprl_uri uri) ;
- (map_of_uri uri)#add uri ((xml_url_of_uri uri) ^ ".xml.gz")
+ (map_of_uri uri)#replace
+ uri ((xml_url_of_uri uri) ^ ".xml.gz")
| [uri] ->
assert (is_cic_uri uri || is_nuprl_uri uri) ;
- (map_of_uri uri)#add uri ((xml_url_of_uri uri) ^ ".xml")
+ (map_of_uri uri)#replace
+ uri ((xml_url_of_uri uri) ^ ".xml")
| _ ->
log := !log ^ "Ignoring invalid line: '" ^ l ^ "'
\n")
with Http_getter_invalid_URI uri ->
@@ -307,8 +317,9 @@ let update_from_server logmsg server_url = (* use global maps *)
(fun l ->
try
(match Pcre.split ~rex:index_line_sep_RE l with
- | [uri; "gz"] -> rdf_map#add uri ((rdf_url_of_uri uri) ^ ".xml.gz")
- | [uri] -> rdf_map#add uri ((rdf_url_of_uri uri) ^ ".xml")
+ | [uri; "gz"] ->
+ rdf_map#replace uri ((rdf_url_of_uri uri) ^ ".xml.gz")
+ | [uri] -> rdf_map#replace uri ((rdf_url_of_uri uri) ^ ".xml")
| _ -> log := !log ^ "Ignoring invalid line: " ^ l ^ "
\n")
with Http_getter_invalid_URI uri ->
log := !log ^ "Ignoring invalid RDF URI: " ^ uri ^ "
\n")
@@ -318,13 +329,25 @@ let update_from_server logmsg server_url = (* use global maps *)
| Some xsl_index ->
(log := !log ^ "Updating XSLT db ...
\n";
List.iter
- (fun l -> xsl_map#add l (server_url ^ "/" ^ l))
+ (fun l -> xsl_map#replace l (server_url ^ "/" ^ l))
(Pcre.split ~rex:index_sep_RE xsl_index);
log := !log ^ "All done!
\n")
| None -> ());
debug_print "done with this server";
!log
in
+let update_from_all_servers () = (* use global maps *)
+ cic_map#clear; nuprl_map#clear; rdf_map#clear; xsl_map#clear;
+ let log =
+ List.fold_left
+ update_from_server
+ "" (* initial logmsg: empty *)
+ (* reverse order: 1st server is the most important one *)
+ (List.rev !Http_getter_env.servers)
+ in
+ cic_map#sync; nuprl_map#sync; rdf_map#sync; xsl_map#sync;
+ log
+in
(* thread action *)
@@ -365,17 +388,74 @@ let callback (req: Http_types.request) outchan =
return_html_msg "Register done" outchan
| _ -> assert false)
| "/update" ->
- (Http_getter_env.reload (); (* reload servers list from servers file *)
- cic_map#clear; nuprl_map#clear; rdf_map#clear; xsl_map#clear;
- let log =
- List.fold_left
- update_from_server
- "" (* initial logmsg: empty *)
- (* reverse order: 1st server is the most important one *)
- (List.rev !Http_getter_env.servers)
+ Http_getter_env.reload (); (* reload servers list from servers file *)
+ let log = update_from_all_servers () in
+ return_html_msg log outchan
+ | "/list_servers" ->
+ return_html_raw
+ (sprintf "