ported debian stuff to ocaml 3.08

[helm.git] / helm / ocaml / cic_annotations_cache / cicCache.ml

diff --git a/helm/ocaml/cic_annotations_cache/cicCache.ml b/helm/ocaml/cic_annotations_cache/cicCache.ml
index de5c1926e6f3d569169e3c08b2ee8ae3cd47641d..5da492f1130f239bda684670d389722755bbf3d7 100644 (file)
--- a/helm/ocaml/cic_annotations_cache/cicCache.ml
+++ b/helm/ocaml/cic_annotations_cache/cicCache.ml
@@ -36,21 +36,25 @@
 (******************************************************************************)
 
 let get_annobj uri =
- let module G = Getter in
  let module U = UriManager in
-  let cicfilename = G.getxml (U.cicuri_of_uri uri) in
+  let cicfilename = Http_getter.getxml' (U.cicuri_of_uri uri) in
   let cicbodyfilename =
    match U.bodyuri_of_uri uri with
       None -> None
-    | Some bodyuri ->
-       Some (G.getxml (U.cicuri_of_uri bodyuri))
+    | Some bodyuri -> Some (Http_getter.getxml' (U.cicuri_of_uri bodyuri))
   in
    let annobj = CicParser.annobj_of_xml cicfilename cicbodyfilename in
+    Unix.unlink cicfilename ;
+    (match cicbodyfilename with None -> () | Some fn -> Unix.unlink fn) ;
     annobj,
      if U.uri_is_annuri uri then
       begin
-       let annfilename = G.getxml (U.annuri_of_uri uri) in
-        Some (CicAnnotationParser.get_annotations annfilename)
+       let annfilename = Http_getter.getxml' (U.annuri_of_uri uri) in
+        let res =
+         Some (CicAnnotationParser.get_annotations annfilename)
+        in
+         Unix.unlink annfilename ;
+         res
       end
      else
       None