X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaDb.ml;h=b5b64d46f1d958c7d9c02a48a099253bb3137176;hb=9adc60caf3223c659d8b64228e90c25cc8d76530;hp=b8f91a342f4d40df64c3252b54b8b09a832f964f;hpb=ee3f2aa5b78aa77555e5e81d5a2d92501889649e;p=helm.git

diff --git a/helm/matita/matitaDb.ml b/helm/matita/matitaDb.ml
index b8f91a342..b5b64d46f 100644
--- a/helm/matita/matitaDb.ml
+++ b/helm/matita/matitaDb.ml
@@ -37,6 +37,7 @@ let instance =
 
 
 let xpointer_RE = Pcre.regexp "#.*$"
+let file_scheme_RE = Pcre.regexp "^file://"
 
 let clean_owner_environment () =
   let dbd = instance () in
@@ -65,10 +66,10 @@ let clean_owner_environment () =
     (fun uri ->
       let uri = Pcre.replace ~rex:xpointer_RE ~templ:"" uri in
       List.iter
-        (fun suffix -> 
-          (*prerr_endline ("unregistering " ^ uri ^ suffix);*)
-          Http_getter.unregister (uri ^ suffix))
-        
+        (fun suffix ->
+          try
+           MatitaMisc.safe_remove (Http_getter.resolve (uri ^ suffix))
+          with Http_getter_types.Key_not_found _ -> ())
         [""; ".body"; ".types"])
     owned_uris;
   List.iter (fun statement -> 
@@ -104,6 +105,7 @@ let create_owner_environment () =
          let status = Mysql.status dbd in
          match status with 
          | Mysql.StatusError Mysql.Table_exists_error -> ()
+         | Mysql.StatusError Mysql.Dup_keyname -> ()
          | Mysql.StatusError _ -> raise exn
          | _ -> ()
       ) statements
@@ -162,7 +164,3 @@ let xpointers_of_ind uri =
   Mysql.iter rc (fun a ->  match a.(0) with None ->()|Some a -> l := a:: !l);
   List.map UriManager.uri_of_string !l
 
-let reset_owner_environment () =
-  clean_owner_environment ();
-  create_owner_environment ()
-