X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_cache%2FcicCache.ml;h=394f9db77bcc158d467fd8db7fa4e86d40bb49d4;hb=f4b9cc6f689b52e0408ac3231ba2a480d71216fb;hp=7dfd8242d1ff724f06d75ce0a5fdf35b89df0cc2;hpb=5a92117eeff70048d29e91ba24e113155d956e1b;p=helm.git

diff --git a/helm/ocaml/cic_cache/cicCache.ml b/helm/ocaml/cic_cache/cicCache.ml
index 7dfd8242d..394f9db77 100644
--- a/helm/ocaml/cic_cache/cicCache.ml
+++ b/helm/ocaml/cic_cache/cicCache.ml
@@ -39,11 +39,34 @@ let get_annobj uri =
  let module G = Getter in
  let module U = UriManager in
   let cicfilename = G.getxml (U.cicuri_of_uri uri) in
-   match CicParser.term_of_xml cicfilename uri false with
-      (_, Some _) -> assert false
-    | (annobj, None) -> annobj
+   match (U.bodyuri_of_uri uri) with
+      None ->
+        let annobj = CicParser.annobj_of_xml cicfilename None in
+         Unix.unlink cicfilename ;
+         annobj
+    | Some bodyuri ->
+       let cicbodyfilename = G.getxml (U.cicuri_of_uri bodyuri) in
+        let annobj =
+         CicParser.annobj_of_xml cicfilename (Some cicbodyfilename)
+        in
+         Unix.unlink cicfilename ;
+         Unix.unlink cicbodyfilename ;
+         annobj
 ;;
 
 let get_obj uri =
- Deannotate.deannotate_obj (get_annobj uri)
+ let module G = Getter in
+ let module U = UriManager in
+  let cicfilename = G.getxml (U.cicuri_of_uri uri) in
+   match (U.bodyuri_of_uri uri) with
+      None ->
+        let obj = CicParser.obj_of_xml cicfilename None in
+         Unix.unlink cicfilename ;
+         obj
+    | Some bodyuri ->
+       let cicbodyfilename = G.getxml (U.cicuri_of_uri bodyuri) in
+       let obj = CicParser.obj_of_xml cicfilename (Some cicbodyfilename) in
+        Unix.unlink cicfilename ;
+        Unix.unlink cicbodyfilename ;
+        obj
 ;;