some improvement for parameters, configuration

[helm.git] / helm / interface / getter.ml

diff --git a/helm/interface/getter.ml b/helm/interface/getter.ml
index d79f395141c0b99ba5c8870e45836bdd14cda128..f6d0a6a380f5395ff0cdb7f44c3db35d360ad4d8 100644 (file)
--- a/helm/interface/getter.ml
+++ b/helm/interface/getter.ml
@@ -34,27 +34,38 @@
 
 exception ErrorGetting of string;;
 
+(* FEATURE MOVED TO HTTP_GETTER, Zack
 module OrderedStrings =
  struct
   type t = string
   let compare (s1 : t) (s2 : t) = compare s1 s2
  end
 ;;
+*)
 
+
+(* FEATURE MOVED TO HTTP_GETTER, Zack
 module MapOfStrings = Map.Make(OrderedStrings);;
+*)
 
+(* FEATURE MOVED TO HTTP_GETTER, Zack
 let read_index url =
  let module C = Configuration in
-  if Sys.command ("helm_wget " ^ C.tmpdir ^ " " ^ url ^ "/\"" ^
+  if Sys.command ("helm_wget " ^ C.tmp_dir ^ " " ^ url ^ "/\"" ^
    C.indexname ^ "\"") <> 0
   then
    raise (ErrorGetting url) ;
-  let tmpfilename = C.tmpdir ^ "/" ^ C.indexname in
+  let tmpfilename = C.tmp_dir ^ "/" ^ C.indexname in
    let fd = open_in tmpfilename in
    let uris = ref [] in
     try
      while true do
-      uris := (input_line fd) :: !uris
+      let (uri,comp) =
+       match (Str.split (Str.regexp "[ \t]+") (input_line fd)) with
+         [uri] -> (uri,"")
+       | [uri;comp] -> (uri,".gz")
+      in
+       uris := (uri,comp) :: !uris
      done ;
      [] (* only to make the compiler happy *)
     with
@@ -62,7 +73,9 @@ let read_index url =
       Sys.remove tmpfilename ;
       !uris
 ;;
+*)
 
+(* FEATURE MOVED TO HTTP_GETTER, Zack
 (* mk_urls_of_uris list_of_servers_base_urls *)
 let rec mk_urls_of_uris =
  function
@@ -70,19 +83,21 @@ let rec mk_urls_of_uris =
   | he::tl ->
      let map = mk_urls_of_uris tl in
       let uris = read_index he in
-       let url_of_uri uri =
-        let url = uri  ^ ".xml" in
+       let url_of_uri (uri,comp) =
+        let url = uri  ^ ".xml" ^ comp in
          let url' = Str.replace_first (Str.regexp "cic:") he url in
          let url'' = Str.replace_first (Str.regexp "theory:") he url' in
           url''
        in
         List.fold_right
-         (fun uri m -> MapOfStrings.add uri (url_of_uri uri) m)
+         (fun (uri,comp) m -> MapOfStrings.add uri (url_of_uri (uri,comp)) m)
          uris map
 ;;
+*)
 
 exception PerlGetterNotResponding;;
 
+(* FEATURE MOVED TO HTTP_GETTER, Zack
 let update () =
  let module C = Configuration in
   let fd = open_in C.servers_file in
@@ -105,6 +120,12 @@ let update () =
        then
         raise PerlGetterNotResponding ;
 ;;
+*)
+
+let update () =
+(* deliver update request to http_getter *)
+ ClientHTTP.send (Configuration.getter_url ^ "update")
+;;
 
 (* url_of_uri : uri -> url *)
 let url_of_uri uri =
@@ -140,6 +161,8 @@ let get_file uri =
    fn
 ;;
 
+let raw_get = ClientHTTP.get_and_save
+
 (* get : uri -> filename *)
 (* If uri is the URI of an annotation, the annotated object is processed *)
 let get uri =