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

diff --git a/helm/matita/matitacleanLib.ml b/helm/matita/matitacleanLib.ml
index 06c6835ca..51635a30a 100644
--- a/helm/matita/matitacleanLib.ml
+++ b/helm/matita/matitacleanLib.ml
@@ -30,10 +30,9 @@ module HGT = Http_getter_types;;
 module HG = Http_getter;;
 module HGM = Http_getter_misc;;
 module UM = UriManager;;
-module TA = TacticAst;;
+module TA = GrafiteAst;;
 
 let baseuri_of_baseuri_decl st =
-  let module TA = TacticAst in
   match st with
   | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", buri))) ->
       Some buri
@@ -130,33 +129,45 @@ let close_uri_list uri_to_remove =
   uri_to_remove, depend
 
 let baseuri_of_file file = 
+  let uri = ref None in
   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 istream = Stream.of_channel ic in
+  (try
+    while true do
+      try 
+        let stm = GrafiteParser.parse_statement istream in
+        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 := Some u;
+            raise End_of_file
+        | None -> ()
+      with
+        CicNotationParser.Parse_error _ as exn ->
+          prerr_endline ("Unable to parse: " ^ file);
+          prerr_endline (MatitaExcPp.to_string exn);
+          ()
+    done
+  with End_of_file -> close_in ic);
+  match !uri with
+  | Some uri -> uri
+  | None -> failwith ("No baseuri defined in " ^ file)
 
 let rec fix uris next =
   match next with
   | [] -> uris
   | l -> let uris, next = close_uri_list l in fix 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
@@ -169,7 +180,15 @@ let clean_baseuris ?(verbose=true) buris =
   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
+  List.iter (MatitaSync.remove ~verbose) l;
+  cleaned_no := !cleaned_no + List.length l;
+  if !cleaned_no > 30 then
+   List.iter
+    (function table ->
+      ignore (Mysql.exec (MatitaDb.instance ()) ("OPTIMIZE TABLE " ^ table)))
+    [MetadataTypes.name_tbl (); MetadataTypes.rel_tbl ();
+     MetadataTypes.sort_tbl (); MetadataTypes.obj_tbl();
+     MetadataTypes.count_tbl()]
   
 let is_empty buri = HG.ls (HGM.strip_trailing_slash buri ^ "/") = []