X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fgetter%2Fhttp_getter_map.ml;h=7c411d8317fc570ae8177c2246f18b2c7b3cb44c;hb=acf29bdbdcdc6ad8c2d9d27e8a47500981b605cd;hp=57ec9273639c543efafde83cac2ceeb43851f5c1;hpb=384c369d4cbf5dd6cf1013902d3a218260400e73;p=helm.git

diff --git a/helm/ocaml/getter/http_getter_map.ml b/helm/ocaml/getter/http_getter_map.ml
index 57ec92736..7c411d831 100644
--- a/helm/ocaml/getter/http_getter_map.ml
+++ b/helm/ocaml/getter/http_getter_map.ml
@@ -26,21 +26,35 @@
  *  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)
 
     inherit ThreadSafe.threadSafe
 
     val mutable db = open_dbm ()
+    val index_RE = Pcre.regexp "^theory:/.*/index.theory$"
 
     (*initializer Gc.finalise Dbm.close db  (* close db on GC *)*)
 
+    (* Backward compatibility code to map
+       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 &&
+        (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
+
     method add key value =
       self#doWriter (lazy (
         try
@@ -62,7 +76,9 @@ class map dbname =
 
     method resolve key =
       self#doReader (lazy (
-        try Dbm.find db key with Not_found -> raise (Key_not_found key)
+        try
+         Dbm.find db (self#normalize_key key)
+        with Not_found -> raise (Key_not_found key)
       ))
 
     method iter (f: string -> string -> unit) =