X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter_misc.ml;h=c983c298813e0a83f5fc8e8be3cc2aa40a38af87;hb=d3c72d6856cd185e5b3e9f2e8b928b78c7031ed1;hp=7b70a14b1112ce975cc5bc01223d59e3eb4d27bc;hpb=cc40c18845dcd9b0bc3264b82940091b26ca53ff;p=helm.git

diff --git a/helm/http_getter/http_getter_misc.ml b/helm/http_getter/http_getter_misc.ml
index 7b70a14b1..c983c2988 100644
--- a/helm/http_getter/http_getter_misc.ml
+++ b/helm/http_getter/http_getter_misc.ml
@@ -1,5 +1,5 @@
 (*
- * Copyright (C) 2003:
+ * Copyright (C) 2003-2004:
  *    Stefano Zacchiroli <zack@cs.unibo.it>
  *    for the HELM Team http://helm.cs.unibo.it/
  *
@@ -26,11 +26,12 @@
  *  http://helm.cs.unibo.it/
  *)
 
-open Http_getter_debugger;;
-open Printf;;
+open Printf
+
+open Http_getter_debugger
 
 let trailing_dot_gz_RE = Pcre.regexp "\\.gz$"   (* for g{,un}zip *)
-let url_RE = Pcre.regexp "^([\\w.]+)(:(\\d+))?(/.*)?$"
+let url_RE = Pcre.regexp "^([\\w.-]+)(:(\\d+))?(/.*)?$"
 let http_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^http://"
 let file_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^file://"
 let dir_sep_RE = Pcre.regexp "/"
@@ -40,16 +41,18 @@ let bufsiz = 16384  (* for file system I/O *)
 let tcp_bufsiz = 4096 (* for TCP I/O *)
 
 let fold_file f init fname =
-  let inchan = open_in fname in
-  let res =
-    try
-      Zack.fold_in f init inchan
-    with e -> close_in inchan; raise e
+  let ic = open_in fname in
+  let rec aux acc =
+    let line = try Some (input_line ic) with End_of_file -> None in
+    match line with
+    | None -> acc
+    | Some line -> aux (f line acc)
   in
-  close_in inchan;
+  let res = try aux init with e -> close_in ic; raise e in
+  close_in ic;
   res
 
-let iter_file f = fold_file (fun _ line -> f line) ()
+let iter_file f = fold_file (fun line _ -> f line) ()
 
 let hashtbl_sorted_fold f tbl init =
   let sorted_keys =
@@ -57,6 +60,12 @@ let hashtbl_sorted_fold f tbl init =
   in
   List.fold_left (fun acc k -> f k (Hashtbl.find tbl k) acc) init sorted_keys
 
+let hashtbl_sorted_iter f tbl =
+  let sorted_keys =
+    List.sort compare (Hashtbl.fold (fun key _ keys -> key::keys) tbl [])
+  in
+  List.iter (fun k -> f k (Hashtbl.find tbl k)) sorted_keys
+
 let cp src dst =
   let (ic, oc) = (open_in src, open_out dst) in
   let buf = String.create bufsiz in
@@ -225,57 +234,17 @@ let http_get url =
       close_in ic;
       Some buf
     with Unix.Unix_error (Unix.ENOENT, "stat", _) -> None
-  end else  (* other URL, pass it to netclient *)
+  end else  (* other URL, pass it to Http_client *)
     try
-      Some (Http_client.Convenience.http_get url)
-    with Http_client.Http_error (code, _) -> None
-
-  (** apply a transformation "string list -> string list" to file lines *)
-let mangle_file ~fname f =
-  let ic = open_in fname in
-  let lines = Zack.input_lines ic in
-  close_in ic;
-  let oc = open_out fname in
-  Zack.output_lines (f lines) oc;
-  close_out oc
-;;
-
-let add_line ~fname ?position line =
-  mangle_file ~fname
-    (fun lines ->
-      match position with
-      | None -> lines @ [line]
-      | Some i ->
-          assert (i >= 0);
-          let rec add_after i = function
-            | (acc, []) -> acc @ [line] (* eof *)
-            | (acc, ((hd::tl) as l)) ->
-                if i = 0 then
-                  acc @ [line] @ l
-                else
-                  add_after (i-1) (acc @ [hd], tl)
-          in
-          add_after i ([], lines))
-;;
-
-let remove_line ~fname position =
-  mangle_file ~fname
-    (fun lines ->
-      assert (position >= 0);
-      let rec remove i = function
-        | (acc, []) -> acc  (* eof *)
-        | (acc, ((hd::tl) as l)) ->
-            if i = 0 then
-              acc @ tl
-            else
-              remove (i-1) (acc @ [hd], tl)
-      in
-      remove position ([], lines))
-;;
+      Some (Http_client.http_get url)
+    with e ->
+      prerr_endline (sprintf
+        "Warning: Http_client failed on url %s with exception: %s"
+        url (Printexc.to_string e));
+      None
 
 let is_blank_line =
   let blank_line_RE = Pcre.regexp "(^#)|(^\\s*$)" in
   fun line ->
     Pcre.pmatch ~rex:blank_line_RE line
-;;