ported to new getter interface

[helm.git] / helm / matita / matitaSync.ml

diff --git a/helm/matita/matitaSync.ml b/helm/matita/matitaSync.ml
index 8f8a66e098fc9378e73ace85e7c2d1a5d8e93e05..374b47870324175c04295ba1e8d749589d2def4c 100644 (file)
--- a/helm/matita/matitaSync.ml
+++ b/helm/matita/matitaSync.ml
@@ -123,12 +123,9 @@ let save_object_to_disk status uri obj =
     (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 *)
@@ -136,15 +133,10 @@ let save_object_to_disk status uri obj =
        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
@@ -186,13 +178,15 @@ let delta_status status1 status2 =
 let remove_coercion uri = 
   CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq u uri)
   
+let safe_remove fname = if Sys.file_exists fname then Sys.remove fname
+
 let time_travel ~present ~past =
   let list_of_objs_to_remove = List.rev (delta_status past present) in
     (* List.rev is just for the debugging code, which otherwise may list both
     * something.ind and something.ind#xpointer ... (ask Enrico :-) *)
   let debug_list = ref [] in
   List.iter (fun (uri,p) -> 
-    remove_object_from_disk uri p;
+    safe_remove p;
     remove_coercion uri;
     (try 
       CicEnvironment.remove_obj uri
@@ -230,11 +224,9 @@ let time_travel ~present ~past =
       MatitaLog.debug "l2:";
       List.iter MatitaLog.debug l2
     
-
 let remove 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])
@@ -247,17 +239,10 @@ let remove uri =
   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
         MatitaLog.debug ("Removing: " ^ UriManager.string_of_uri uri);
-        remove_object_from_disk uri path; 
-      with
-        Http_getter_types.Key_not_found _ -> Http_getter.unregister' uri);
+        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
-  
-  
+