X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fgetter%2Fhttp_getter_map.ml;h=7c411d8317fc570ae8177c2246f18b2c7b3cb44c;hb=6912a028bef118d8e9d7c2847200510a9b055c6a;hp=1b5d209d330a2ea8593830ffe530e6ce5d65314f;hpb=0224ce3e20ff502b7ce04865bc23ed99a47c764d;p=helm.git

diff --git a/helm/ocaml/getter/http_getter_map.ml b/helm/ocaml/getter/http_getter_map.ml
index 1b5d209d3..7c411d831 100644
--- a/helm/ocaml/getter/http_getter_map.ml
+++ b/helm/ocaml/getter/http_getter_map.ml
@@ -26,12 +26,14 @@
  *  http://helm.cs.unibo.it/
  *)
 
-exception Key_already_in of string;;
-exception Key_not_found of string;;
+open Http_getter_types
 
 class map dbname =
   let perm = 420 in (* permission 644 in decimal notation *)
-  let open_dbm () = Dbm.opendbm dbname [ Dbm.Dbm_rdwr; Dbm.Dbm_create ] perm in
+  let open_dbm () =
+    Http_getter_misc.mkdir ~parents:true (Filename.dirname dbname);
+    Dbm.opendbm dbname [ Dbm.Dbm_rdwr; Dbm.Dbm_create ] perm
+  in
   
   object (self)
 
@@ -46,7 +48,9 @@ class map dbname =
        theory:/path/t.theory into theory:/path/t/index.theory
        when cic:/path/t/ exists *)
     method private normalize_key key =
-     if Pcre.pmatch ~rex:index_RE key then
+     if Pcre.pmatch ~rex:index_RE key &&
+        (try ignore (Dbm.find db key); false with Not_found -> true)
+     then
       (* we substitute /index.theory with .theory *)
       String.sub key 0 (String.length key - 13) ^ ".theory"
      else key
@@ -54,19 +58,19 @@ class map dbname =
     method add key value =
       self#doWriter (lazy (
         try
-          Dbm.add db (self#normalize_key key) value
+          Dbm.add db key value
         with Dbm.Dbm_error "Entry already exists" -> raise (Key_already_in key)
       ))
 
     method replace key value =
       self#doWriter (lazy (
-        Dbm.replace db (self#normalize_key key) value
+        Dbm.replace db key value
       ))
 
     method remove key =
       self#doWriter (lazy (
         try
-          Dbm.remove db (self#normalize_key key)
+          Dbm.remove db key
         with Dbm.Dbm_error "dbm_delete" -> raise (Key_not_found key)
       ))