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 ->
+ 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 =
- 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 ->
+ 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)
;;