- clear also .db db files

- added #close method

diff --git a/helm/http_getter/http_getter_map.ml b/helm/http_getter/http_getter_map.ml
index 7a5ed1a3bc93ca1490b607f7574bd65e78acffde..26daa21d5f2695f5b1ddcf6c22ea933b985cb6b9 100644 (file)
--- a/helm/http_getter/http_getter_map.ml
+++ b/helm/http_getter/http_getter_map.ml
@@ -40,7 +40,7 @@ class map dbname =
 
     val mutable db = open_dbm ()
 
-    initializer Gc.finalise Dbm.close db  (* close db on GC *)
+    (*initializer Gc.finalise Dbm.close db  (* close db on GC *)*)
 
     method add key value =
       self#doWriter (lazy (
@@ -75,10 +75,18 @@ class map dbname =
     method clear =
       self#doWriter (lazy (
         Dbm.close db;
-        Sys.remove (dbname ^ ".dir");
-        Sys.remove (dbname ^ ".pag");
+        List.iter
+          (fun ext ->
+            let file = dbname ^ ext in
+            if Sys.file_exists file then Sys.remove file)
+          [".dir"; ".pag"; ".db"];
         db <- open_dbm ()
       ))
 
+    method close =
+      self#doWriter (lazy (
+        Dbm.close db
+      ))
+
   end
 

diff --git a/helm/http_getter/http_getter_map.mli b/helm/http_getter/http_getter_map.mli
index 3e0cd0878915e93d0643f3a22a95709f963a0db7..b0725b8defa152f2f9cdab1667ae98a3df8d90dc 100644 (file)
--- a/helm/http_getter/http_getter_map.mli
+++ b/helm/http_getter/http_getter_map.mli
@@ -36,4 +36,6 @@ class map:
       method iter: (string -> string -> unit) -> unit
       method sync: unit
       method clear: unit
+
+      method close: unit (* use with caution! *)
     end