(******************************************************************************)
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 true with
- (_, None) -> assert false
- | (annobj, Some ids_to_targets) ->
- if U.uri_is_annuri uri then
- begin
- let annfilename = G.getxml (U.annuri_of_uri uri) in
- CicAnnotationParser.annotate annfilename ids_to_targets
- end ;
- (annobj, ids_to_targets)
+ 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 (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 = Http_getter.getxml' (U.annuri_of_uri uri) in
+ let res =
+ Some (CicAnnotationParser.get_annotations annfilename)
+ in
+ Unix.unlink annfilename ;
+ res
+ end
+ else
+ None
;;