X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaSync.ml;h=23e3b048f45bd015a184d2b6273b9cd257c1406e;hb=63722506a5e378f3e05b46612cb91c132d994082;hp=42e8f1c404f0747552a2ffb3f2dda8b5b809457e;hpb=76c28672a95473ee68935a7ca09b69f9b2f9cdc8;p=helm.git

diff --git a/helm/matita/matitaSync.ml b/helm/matita/matitaSync.ml
index 42e8f1c40..23e3b048f 100644
--- a/helm/matita/matitaSync.ml
+++ b/helm/matita/matitaSync.ml
@@ -27,6 +27,24 @@ open Printf
 
 open MatitaTypes
 
+let alias_diff ~from status = 
+  let module Map = DisambiguateTypes.Environment in
+  Map.fold
+    (fun domain_item codomain_item acc ->
+       if not (Map.mem domain_item from.aliases) then
+         Map.add domain_item codomain_item acc
+       else
+         acc)
+    status.aliases Map.empty
+
+let set_proof_aliases status aliases =
+ let new_status = {status with aliases = aliases } in
+ let diff = alias_diff ~from:status new_status in
+ let moo_content_rev =
+  CicTextualParser2.EnvironmentP3.to_string diff ::
+   status.moo_content_rev in
+ {new_status with moo_content_rev = moo_content_rev}
+  
 (** given a uri and a type list (the contructors types) builds a list of pairs
  *  (name,uri) that is used to generate authomatic aliases **)
 let extract_alias types uri = 
@@ -48,13 +66,13 @@ let env_of_list l env =
 let add_aliases_for_inductive_def status types suri = 
   let uri = UriManager.uri_of_string suri in
   let aliases = env_of_list (extract_alias types uri) status.aliases in
-  {status with aliases = aliases }
+  set_proof_aliases status aliases
 
 let add_alias_for_constant status suri =
  let uri = UriManager.uri_of_string suri in
  let name = UriManager.name_of_uri uri in
  let new_env = env_of_list [(name,suri)] status.aliases in
- {status with aliases = new_env }
+ set_proof_aliases status new_env
 
 let add_aliases_for_object status suri =
  function
@@ -105,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 *)
@@ -118,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
@@ -174,7 +184,7 @@ let time_travel ~present ~past =
     * 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
@@ -212,19 +222,25 @@ let time_travel ~present ~past =
       MatitaLog.debug "l2:";
       List.iter MatitaLog.debug l2
     
-let alias_diff ~from status = 
-  let module Map = DisambiguateTypes.Environment in
-  Map.fold
-    (fun domain_item codomain_item acc ->
-       if not (Map.mem domain_item from.aliases) then
-         Map.add domain_item codomain_item acc
-       else
-         acc)
-    status.aliases Map.empty
-
 let remove uri =
-  let path = Http_getter.resolve' uri in
-  remove_object_from_disk uri path;
-  remove_coercion uri;
-  ignore(MatitaDb.remove_uri uri)
-  
+  let derived_uris_of_uri uri =
+    UriManager.innertypesuri_of_uri uri ::
+    (match UriManager.bodyuri_of_uri uri with
+    | None -> []
+    | Some u -> [u])
+  in
+  let to_remove =
+    uri :: 
+    (if UriManager.uri_is_ind uri then MatitaDb.xpointers_of_ind uri else []) @
+    derived_uris_of_uri uri   
+  in   
+  List.iter 
+    (fun uri -> 
+      (try
+        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))
+  to_remove
+