open Http_getter_common
open Http_getter_misc
-open Http_getter_debugger
open Http_getter_types
exception Not_implemented of string
type logger_callback = HelmLogger.html_tag -> unit
+let stdout_logger tag = print_string (HelmLogger.string_of_html_tag tag)
+
let not_implemented s = raise (Not_implemented ("Http_getter." ^ s))
let (index_line_sep_RE, index_sep_RE, trailing_types_RE,
| uri -> raise (Unresolvable_URI uri)
let update_from_server logger server_url = (* use global maps *)
- debug_print ("Updating information from " ^ server_url);
+ Http_getter_logger.log ("Updating information from " ^ server_url);
let xml_url_of_uri = function
(* TODO missing sanity checks on server_url, e.g. it can contains $1 *)
| uri when (Pcre.pmatch ~rex:heading_cic_RE uri) ->
http_get (server_url ^ "/" ^ (Lazy.force Http_getter_env.xsl_index)))
in
if (xml_index = None && rdf_index = None && xsl_index = None) then
- debug_print (sprintf "Warning: useless server %s" server_url);
+ Http_getter_logger.log (sprintf "Warning: useless server %s" server_url);
(match xml_index with
| Some xml_index ->
- logger (`T "Updating XML db ...");
- logger `BR;
+ logger (`T "- Updating XML db ...");
+(* logger `BR; *)
List.iter
(function
| l when is_blank_line l -> () (* skip blank and commented lines *)
| None -> ());
(match rdf_index with
| Some rdf_index ->
- logger (`T "Updating RDF db ...");
- logger `BR;
+ logger (`T "- Updating RDF db ...");
+(* logger `BR; *)
List.iter
(fun l ->
try
| None -> ());
(match xsl_index with
| Some xsl_index ->
- logger (`T "Updating XSLT db ...");
- logger `BR;
+ logger (`T "- Updating XSLT db ...");
+(* logger `BR; *)
List.iter
(fun l -> (Lazy.force xsl_map) # replace l (server_url ^ "/" ^ l))
(Pcre.split ~rex:index_sep_RE xsl_index);
logger (`T "All done");
logger `BR
| None -> ());
- debug_print "done with this server"
+ Http_getter_logger.log "done with this server"
let update_from_all_servers logger () = (* use global maps *)
clear_maps ();
(* deliver resolve request to http_getter *)
let doc = ClientHTTP.get (sprintf "%sresolve?uri=%s" (getter_url ()) uri) in
let res = ref Unknown in
- Pxp_yacc.process_entity Pxp_yacc.default_config (`Entry_content [])
- (Pxp_yacc.create_entity_manager ~is_document:true Pxp_yacc.default_config
+ Pxp_yacc.process_entity PxpHelmConf.pxp_config (`Entry_content [])
+ (Pxp_yacc.create_entity_manager ~is_document:true PxpHelmConf.pxp_config
(Pxp_yacc.from_string doc))
(function
| Pxp_yacc.E_start_tag ("url",["value",url],_) -> res := Resolved url