moved list_uniq to the extlib

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

diff --git a/helm/matita/matitacleanLib.ml b/helm/matita/matitacleanLib.ml
index dafd8097cbeb69d66450562c62601587dd35b014..77a7d7b6f633c64233404f672ea9db4412946ffb 100644 (file)
--- a/helm/matita/matitacleanLib.ml
+++ b/helm/matita/matitacleanLib.ml
@@ -47,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
@@ -77,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
@@ -117,8 +117,7 @@ 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
 
@@ -136,15 +135,15 @@ let clean_baseuris ?(verbose=true) buris =
   if debug then
     List.iter debug_prerr buris; 
   let l = close [] buris in
-  let l = MatitaMisc.list_uniq (List.fast_sort Pervasives.compare l) 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; 
   Hashtbl.iter
    (fun buri _ ->
-     MatitaMisc.safe_remove (MatitaMisc.obj_file_of_baseuri buri)
-   ) cache_of_processed_baseuri;
+     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
@@ -152,7 +151,7 @@ let clean_baseuris ?(verbose=true) buris =
     cleaned_no := 0;
     List.iter
      (function table ->
-       ignore (Mysql.exec (MatitaDb.instance ()) ("OPTIMIZE TABLE " ^ table)))
+       ignore (HMysql.exec (MatitaDb.instance ()) ("OPTIMIZE TABLE " ^ table)))
      [MetadataTypes.name_tbl (); MetadataTypes.rel_tbl ();
       MetadataTypes.sort_tbl (); MetadataTypes.obj_tbl();
       MetadataTypes.count_tbl()]