X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacleanLib.ml;h=51268acef0c8084216a7107346308b23813f3416;hb=28ac70d3f475442cda4ef30e0e9c0e6d012b2527;hp=8b54e98d9e767c0064bfa1bf8b8bb337dce92e9f;hpb=dfd52816897503e09556108be7f56681dc2bc992;p=helm.git

diff --git a/helm/matita/matitacleanLib.ml b/helm/matita/matitacleanLib.ml
index 8b54e98d9..51268acef 100644
--- a/helm/matita/matitacleanLib.ml
+++ b/helm/matita/matitacleanLib.ml
@@ -32,12 +32,6 @@ module HGM = Http_getter_misc;;
 module UM = UriManager;;
 module TA = GrafiteAst;;
 
-let baseuri_of_baseuri_decl st =
-  match st with
-  | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", buri))) ->
-      Some buri
-  | _ -> None
-
 let cache_of_processed_baseuri = Hashtbl.create 1024
 
 let one_step_depend suri =
@@ -53,15 +47,15 @@ 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 -> 
@@ -128,37 +122,10 @@ let close_uri_list uri_to_remove =
   in
   uri_to_remove, depend
 
-let baseuri_of_file file = 
-  let uri = ref None in
-  let ic = open_in file in
-  let istream = Stream.of_channel ic in
-  (try
-    while true do
-      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 -> ()
-    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 =
+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;;
 
@@ -168,21 +135,25 @@ let clean_baseuris ?(verbose=true) buris =
   debug_prerr "clean_baseuris called on:";
   if debug then
     List.iter debug_prerr buris; 
-  let l = fix [] buris in
+  let l = close [] buris in
   let l = MatitaMisc.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; 
+  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
-   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 ^ "/") = []
-
+   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