X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacleanLib.ml;h=77a7d7b6f633c64233404f672ea9db4412946ffb;hb=0bf96cb668cdd8d14b1c66f8a5241f12c5df9e3a;hp=06c6835ca5797b32b09a38e68c06cc55d88bb526;hpb=b11d278a26840884692cdfb89e168081134d293f;p=helm.git

diff --git a/helm/matita/matitacleanLib.ml b/helm/matita/matitacleanLib.ml
index 06c6835ca..77a7d7b6f 100644
--- a/helm/matita/matitacleanLib.ml
+++ b/helm/matita/matitacleanLib.ml
@@ -30,14 +30,7 @@ module HGT = Http_getter_types;;
 module HG = Http_getter;;
 module HGM = Http_getter_misc;;
 module UM = UriManager;;
-module TA = TacticAst;;
-
-let baseuri_of_baseuri_decl st =
-  let module TA = TacticAst in
-  match st with
-  | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", buri))) ->
-      Some buri
-  | _ -> None
+module TA = GrafiteAst;;
 
 let cache_of_processed_baseuri = Hashtbl.create 1024
 
@@ -54,22 +47,22 @@ let one_step_depend suri =
       Hashtbl.add cache_of_processed_baseuri buri true;
       let query = 
         let buri = buri ^ "/" in 
-        let buri = Mysql.escape buri in
+        let buri = HMysql.escape buri in
         let obj_tbl = MetadataTypes.obj_tbl () in
         Printf.sprintf 
           "SELECT source, h_occurrence FROM %s WHERE h_occurrence LIKE '%s%%'" obj_tbl buri
       in
       try 
-        let rc = Mysql.exec (MatitaDb.instance ()) query in
+        let rc = HMysql.exec (MatitaDb.instance ()) query in
         let l = ref [] in
-        Mysql.iter rc (
+        HMysql.iter rc (
           fun row -> 
             match row.(0), row.(1) with 
             | Some uri, Some occ when Filename.dirname occ = buri -> 
                 l := uri :: !l
             | _ -> ());
         let l = List.sort Pervasives.compare !l in
-        MatitaMisc.list_uniq l
+        HExtlib.list_uniq l
       with
         exn -> raise exn (* no errors should be accepted *)
     end
@@ -84,7 +77,7 @@ let safe_buri_of_suri suri =
 let close_uri_list uri_to_remove =
   (* to remove an uri you have to remove the whole script *)
   let buri_to_remove = 
-    MatitaMisc.list_uniq 
+    HExtlib.list_uniq 
       (List.fast_sort Pervasives.compare 
         (List.map safe_buri_of_suri uri_to_remove))
   in
@@ -124,52 +117,42 @@ let close_uri_list uri_to_remove =
     (fun acc u -> one_step_depend u @ acc) [] uri_to_remove
   in
   let depend = 
-    MatitaMisc.list_uniq 
-      (List.fast_sort Pervasives.compare depend) 
+    HExtlib.list_uniq (List.fast_sort Pervasives.compare depend) 
   in
   uri_to_remove, depend
 
-let baseuri_of_file file = 
-  let ic = open_in file in
-  let stms = CicTextualParser2.parse_statements (Stream.of_channel ic) in
-  close_in ic;
-  let uri = ref "" in
-  List.iter 
-    (fun stm ->
-      match baseuri_of_baseuri_decl stm with
-      | Some buri -> 
-          let u = MatitaMisc.strip_trailing_slash buri in
-          if String.length u < 5 || String.sub u 0 5 <> "cic:/" then
-            MatitaLog.error (file ^ " sets an incorrect baseuri: " ^ buri);
-          (try 
-            ignore(HG.resolve u)
-          with
-          | HGT.Unresolvable_URI _ -> 
-              MatitaLog.error (file ^ " sets an unresolvable baseuri: "^buri)
-          | HGT.Key_not_found _ -> ());
-          uri := u
-      | None -> ())
-    stms;
-  !uri
-
-let rec fix uris next =
+let rec close uris next =
   match next with
   | [] -> uris
-  | l -> let uris, next = close_uri_list l in fix uris next @ uris
+  | l -> let uris, next = close_uri_list l in close uris next @ uris
   
+let cleaned_no = ref 0;;
+
 let clean_baseuris ?(verbose=true) buris =
   Hashtbl.clear cache_of_processed_baseuri;
   let buris = List.map HGM.strip_trailing_slash buris in
   debug_prerr "clean_baseuris called on:";
   if debug then
     List.iter debug_prerr buris; 
-  let l = fix [] buris in
-  let l = MatitaMisc.list_uniq (List.fast_sort Pervasives.compare l) in
+  let l = close [] buris in
+  let l = HExtlib.list_uniq (List.fast_sort Pervasives.compare l) in
   let l = List.map UriManager.uri_of_string l in
   debug_prerr "clean_baseuri will remove:";
   if debug then
     List.iter (fun u -> debug_prerr (UriManager.string_of_uri u)) l; 
-  List.iter (MatitaSync.remove ~verbose) l
-  
-let is_empty buri = HG.ls (HGM.strip_trailing_slash buri ^ "/") = []
-
+  Hashtbl.iter
+   (fun buri _ ->
+     MatitaMisc.safe_remove (MatitaMisc.obj_file_of_baseuri buri)) 
+   cache_of_processed_baseuri;
+  List.iter (MatitaSync.remove ~verbose) l;
+  cleaned_no := !cleaned_no + List.length l;
+  if !cleaned_no > 30 then
+   begin
+    cleaned_no := 0;
+    List.iter
+     (function table ->
+       ignore (HMysql.exec (MatitaDb.instance ()) ("OPTIMIZE TABLE " ^ table)))
+     [MetadataTypes.name_tbl (); MetadataTypes.rel_tbl ();
+      MetadataTypes.sort_tbl (); MetadataTypes.obj_tbl();
+      MetadataTypes.count_tbl()]
+   end