Merge of the V7_3_new_exportation branch.

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

diff --git a/helm/ocaml/cic_cache/cicCache.ml b/helm/ocaml/cic_cache/cicCache.ml
index adfeb0575dcbe909d75895eb6e957ee3d7221726..1080c39e76873171f9cc64e486b2c8de50a5adfd 100644 (file)
--- a/helm/ocaml/cic_cache/cicCache.ml
+++ b/helm/ocaml/cic_cache/cicCache.ml
@@ -39,12 +39,22 @@ let get_annobj uri =
  let module G = Getter in
  let module U = UriManager in
   let cicfilename = G.getxml (U.cicuri_of_uri uri) in
-   CicParser.annobj_of_xml cicfilename uri
+   match (U.bodyuri_of_uri uri) with
+      None ->
+        CicParser.annobj_of_xml cicfilename None
+    | Some bodyuri ->
+       let cicbodyfilename = G.getxml (U.cicuri_of_uri bodyuri) in
+        CicParser.annobj_of_xml cicfilename (Some cicbodyfilename)
 ;;
 
 let get_obj uri =
  let module G = Getter in
  let module U = UriManager in
   let cicfilename = G.getxml (U.cicuri_of_uri uri) in
-   CicParser.obj_of_xml cicfilename uri
+   match (U.bodyuri_of_uri uri) with
+      None ->
+        CicParser.obj_of_xml cicfilename None
+    | Some bodyuri ->
+       let cicbodyfilename = G.getxml (U.cicuri_of_uri bodyuri) in
+        CicParser.obj_of_xml cicfilename (Some cicbodyfilename)
 ;;