- added via_http parameter so that when the getter is used locally (i.e.

[helm.git] / helm / ocaml / getter / http_getter.ml

diff --git a/helm/ocaml/getter/http_getter.ml b/helm/ocaml/getter/http_getter.ml
index 97e8c2f431f435ec82df87ae4ab8d0cbd3d7f8f9..a817f7448d52a6baa35241bb91246c41f9b71bfb 100644 (file)
--- a/helm/ocaml/getter/http_getter.ml
+++ b/helm/ocaml/getter/http_getter.ml
@@ -98,6 +98,7 @@ let update_from_server logger server_url = (* use global maps *)
     | uri -> raise (Invalid_URI uri)
   in
   logger (`T ("Processing server: " ^ server_url));
+  logger `BR;
   let (xml_index, rdf_index, xsl_index) =
     (* TODO keeps index in memory, is better to keep them on temp files? *)
     (http_get (server_url ^ "/" ^ (Lazy.force Http_getter_env.xml_index)),
@@ -108,7 +109,8 @@ let update_from_server logger server_url = (* use global maps *)
     debug_print (sprintf "Warning: useless server %s" server_url);
   (match xml_index with
   | Some xml_index ->
-      logger (`T "Updating XML db ...<br />");
+      logger (`T "Updating XML db ...");
+      logger `BR;
       List.iter
         (function
           | l when is_blank_line l -> ()  (* skip blank and commented lines *)
@@ -123,15 +125,20 @@ let update_from_server logger server_url = (* use global maps *)
                    assert (is_cic_uri uri || is_nuprl_uri uri) ;
                    (map_of_uri uri)#replace
                     uri ((xml_url_of_uri uri) ^ ".xml")
-                | _ -> logger (`T ("Ignoring invalid line: '" ^ l)))
+                | _ ->
+                    logger (`T ("Ignoring invalid line: '" ^ l));
+                    logger `BR)
               with Invalid_URI uri ->
-                logger (`T ("Ignoring invalid XML URI: '" ^ l))))
+                logger (`T ("Ignoring invalid XML URI: '" ^ l));
+                logger `BR))
         (Pcre.split ~rex:index_sep_RE xml_index); (* xml_index lines *)
-      logger (`T "All done")
+      logger (`T "All done");
+      logger `BR
   | None -> ());
   (match rdf_index with
   | Some rdf_index ->
       logger (`T "Updating RDF db ...");
+      logger `BR;
       List.iter
         (fun l ->
           try
@@ -142,19 +149,25 @@ let update_from_server logger server_url = (* use global maps *)
             | [uri] ->
                 (Lazy.force rdf_map) # replace uri
                   ((rdf_url_of_uri uri) ^ ".xml")
-            | _ -> logger (`T ("Ignoring invalid line: '" ^ l)))
+            | _ ->
+                logger (`T ("Ignoring invalid line: '" ^ l));
+                logger `BR)
           with Invalid_URI uri ->
-            logger (`T ("Ignoring invalid RDF URI: '" ^ l)))
+            logger (`T ("Ignoring invalid RDF URI: '" ^ l));
+            logger `BR)
         (Pcre.split ~rex:index_sep_RE rdf_index); (* rdf_index lines *)
-      logger (`T "All done")
+      logger (`T "All done");
+      logger `BR
   | None -> ());
   (match xsl_index with
   | Some xsl_index ->
       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 (`T "All done");
+      logger `BR
   | None -> ());
   debug_print "done with this server"
 
@@ -230,11 +243,11 @@ let update_remote logger  () =
   logger (`T answer)
 
 let getxml_remote ~format ~patch_dtd uri =
- ClientHTTP.get_and_save_to_tmp
-  (sprintf "%sgetxml?uri=%s&format=%s&patch_dtd=%s"
-    (getter_url ()) uri
-    (match format with Enc_normal -> "normal" | Enc_gzipped -> "gzipped")
-    (match patch_dtd with true -> "yes" | false -> "no"))
+  ClientHTTP.get_and_save_to_tmp
+    (sprintf "%sgetxml?uri=%s&format=%s&patch_dtd=%s"
+      (getter_url ()) uri
+      (match format with `Normal -> "normal" | `Gzipped -> "gzipped")
+      (match patch_dtd with true -> "yes" | false -> "no"))
 
 (* API *)
 
@@ -261,14 +274,14 @@ let update ?(logger = fun _ -> ()) () =
   else
     update_from_all_servers logger ()
 
-let getxml ?(format = Enc_normal) ?(patch_dtd = true) uri =
+let getxml ?(format = `Normal) ?(patch_dtd = true) uri =
   if remote () then
     getxml_remote ~format ~patch_dtd uri
   else begin
     let url = resolve uri in
     let (fname, outchan) = temp_file_of_uri uri in
-    Http_getter_cache.respond_xml ~uri ~url ~enc:format ~patch:patch_dtd
-      outchan;
+    Http_getter_cache.respond_xml ~via_http:false ~enc:format ~patch:patch_dtd
+      ~uri ~url outchan;
     close_out outchan;
     fname
   end
@@ -279,7 +292,7 @@ let getxslt ?(patch_dtd = true) uri =
   else begin
     let url = resolve uri in
     let (fname, outchan) = temp_file_of_uri uri in
-    Http_getter_cache.respond_xsl ~url ~patch:patch_dtd outchan;
+    Http_getter_cache.respond_xsl ~via_http:false ~url ~patch:patch_dtd outchan;
     close_out outchan;
     fname
   end
@@ -290,7 +303,7 @@ let getdtd ?(patch_dtd = true) uri =
   else begin
     let url = Lazy.force Http_getter_env.dtd_dir ^ "/" ^ uri in
     let (fname, outchan) = temp_file_of_uri uri in
-    Http_getter_cache.respond_dtd ~url ~patch:patch_dtd outchan;
+    Http_getter_cache.respond_dtd ~via_http:false ~url ~patch:patch_dtd outchan;
     close_out outchan;
     fname
   end