(******************************************************************************)
let get_annobj uri =
- let module G = Getter in
let module U = UriManager in
- let cicfilename = G.getxml (U.cicuri_of_uri uri) in
+ let cicfilename = Http_getter.getxml' (U.cicuri_of_uri uri) in
match (U.bodyuri_of_uri uri) with
None ->
let annobj = CicParser.annobj_of_xml cicfilename None in
| Some bodyuri ->
let cicbodyfilename =
try
- ignore (Getter.resolve bodyuri) ;
+ ignore (Http_getter.resolve' bodyuri) ;
(* The body exists ==> it is not an axiom *)
- Some (Getter.getxml bodyuri)
+ Some (Http_getter.getxml' bodyuri)
with
- Getter.Unresolved ->
+ Http_getter_types.Unresolvable_URI _ ->
(* The body does not exist ==> we consider it an axiom *)
None
in
;;
let get_obj uri =
- let module G = Getter in
let module U = UriManager in
- let cicfilename = G.getxml (U.cicuri_of_uri uri) in
+ let cicfilename = Http_getter.getxml' (U.cicuri_of_uri uri) in
match (U.bodyuri_of_uri uri) with
None ->
let obj = CicParser.obj_of_xml cicfilename None in
| Some bodyuri ->
let cicbodyfilename =
try
- ignore (Getter.resolve bodyuri) ;
+ ignore (Http_getter.resolve' bodyuri) ;
(* The body exists ==> it is not an axiom *)
- Some (Getter.getxml bodyuri)
- with
- Getter.Unresolved ->
+ Some (Http_getter.getxml' bodyuri)
+ with Http_getter_types.Unresolvable_URI _ ->
(* The body does not exist ==> we consider it an axiom *)
None
in