- let cicfilename = G.getxml (U.cicuri_of_uri uri) in
- let annobj = CicParser.annobj_of_xml cicfilename 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 (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) ;