version 0.7.1

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

diff --git a/helm/matita/matitaDb.ml b/helm/matita/matitaDb.ml
index 089aab157abc72b800018d84372fa7d6a6a98aeb..b5b64d46f1d958c7d9c02a48a099253bb3137176 100644 (file)
--- a/helm/matita/matitaDb.ml
+++ b/helm/matita/matitaDb.ml
@@ -66,7 +66,10 @@ let clean_owner_environment () =
     (fun uri ->
       let uri = Pcre.replace ~rex:xpointer_RE ~templ:"" uri in
       List.iter
-        (fun suffix -> Http_getter_storage.remove (uri ^ suffix ^ ".xml.gz"))
+        (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 -> 
@@ -102,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
@@ -160,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 ()
-