X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacleanLib.ml;h=a616519c1c2a4a1eacfab508f3e14d0103d87681;hb=249d79bebff886846fbab65cc079623d90684baf;hp=992443a357681615771315cac4710c87aadd067b;hpb=ee3f2aa5b78aa77555e5e81d5a2d92501889649e;p=helm.git

diff --git a/helm/matita/matitacleanLib.ml b/helm/matita/matitacleanLib.ml
index 992443a35..a616519c1 100644
--- a/helm/matita/matitacleanLib.ml
+++ b/helm/matita/matitacleanLib.ml
@@ -1,8 +1,16 @@
 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
+
 let cache_of_processed_baseuri = Hashtbl.create 1024
 
 let one_step_depend suri =
@@ -21,12 +29,17 @@ let one_step_depend suri =
         let buri = Mysql.escape buri in
         let obj_tbl = MetadataTypes.obj_tbl () in
         Printf.sprintf 
-          "SELECT source FROM %s WHERE h_occurrence LIKE '%s%%'" obj_tbl buri
+          "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 l = ref [] in
-        Mysql.iter rc (fun a -> match a.(0) with None ->()|Some a -> l:=a:: !l);
+        Mysql.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
       with
@@ -90,10 +103,10 @@ let baseuri_of_file file =
   close_in ic;
   let uri = ref "" in
   List.iter 
-    (function
-    | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", buri))) ->
-        uri := MatitaMisc.strip_trailing_slash buri
-    | _ -> ()) 
+    (fun stm ->
+      match baseuri_of_baseuri_decl stm with
+      | Some buri -> uri := MatitaMisc.strip_trailing_slash buri
+      | None -> ())
     stms;
   !uri
 
@@ -102,9 +115,14 @@ let rec fix uris next =
   | [] -> uris
   | l -> let uris, next = close_uri_list l in fix uris next @ uris
   
-let clean_baseuris buris =
+let clean_baseuris ?(verbose=true) buris =
+  let buris = List.map HGM.strip_trailing_slash buris in
+  (* List.iter prerr_endline buris; *)
   let l = fix [] buris in
   let l = MatitaMisc.list_uniq (List.fast_sort Pervasives.compare l) in
   let l = List.map UriManager.uri_of_string l in
-  List.iter MatitaSync.remove l
+  (* List.iter (fun u -> prerr_endline (UriManager.string_of_uri u)) l; *)
+  List.iter (MatitaSync.remove ~verbose) l
   
+let is_empty buri = HG.ls (HGM.strip_trailing_slash buri ^ "/") = []
+