(List.map Filename.dirname [innertypespath; xmlpath]);
(* now write to disk *)
ensure_path_exists innertypespath;
- Xml.pp ~gzip:true xmlinnertypes (Some innertypespath) ;
+ Xml.pp ~gzip:true xmlinnertypes (Some innertypespath);
ensure_path_exists xmlpath;
Xml.pp ~gzip:true xml (Some xmlpath) ;
- (* now register to the getter *)
- Http_getter.register' innertypesuri (path_scheme_of innertypespath);
- Http_getter.register' uri (path_scheme_of xmlpath);
(* we return a list of uri,path we registered/created *)
(uri,xmlpath) :: (innertypesuri,innertypespath) ::
(* now the optional body, both write and register *)
None,None -> []
| Some bodyxml,Some bodyuri->
ensure_path_exists xmlbodypath;
- Xml.pp ~gzip:true bodyxml (Some xmlbodypath) ;
- Http_getter.register' bodyuri (path_scheme_of xmlbodypath);
- [bodyuri,xmlbodypath]
+ Xml.pp ~gzip:true bodyxml (Some xmlbodypath);
+ [bodyuri, xmlbodypath]
| _-> assert false)
-let remove_object_from_disk uri path =
- Sys.remove path;
- Http_getter.unregister' uri
-
let add_obj uri obj status =
let dbd = MatitaDb.instance () in
let suri = UriManager.string_of_uri uri in
* something.ind and something.ind#xpointer ... (ask Enrico :-) *)
let debug_list = ref [] in
List.iter (fun (uri,p) ->
- remove_object_from_disk uri p;
+ MatitaMisc.safe_remove p;
remove_coercion uri;
(try
CicEnvironment.remove_obj uri
MatitaLog.debug "l2:";
List.iter MatitaLog.debug l2
-
-let remove uri =
+let remove ~verbose uri =
let derived_uris_of_uri uri =
UriManager.innertypesuri_of_uri uri ::
- UriManager.annuri_of_uri uri ::
(match UriManager.bodyuri_of_uri uri with
| None -> []
| Some u -> [u])
List.iter
(fun uri ->
(try
- let path =
- let path = Http_getter.resolve' (UriManager.strip_xpointer uri) in
- assert (String.sub path 0 7 = "file://");
- String.sub path 7 (String.length path - 7)
- in
- remove_object_from_disk uri path;
- with
- Http_getter_types.Key_not_found _ -> Http_getter.unregister' uri);
+ if verbose then
+ MatitaLog.debug ("Removing: " ^ UriManager.string_of_uri uri);
+ MatitaMisc.safe_remove (Http_getter.resolve' uri)
+ with Http_getter_types.Key_not_found _ -> ());
remove_coercion uri;
- ignore(MatitaDb.remove_uri uri))
+ ignore (MatitaDb.remove_uri uri))
to_remove
-
-