X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fhmysql%2FhSqlite3.ml;h=20e49451119fee9a5fca94f0db39a8f938124c47;hb=748a6a2ba28c43e128759efbcc04919420e38cc1;hp=80c939ac8a88f93f393c83cd83e4584a3ebced12;hpb=946f85ff8a6cbfd3712a73919cdadc4d99916971;p=helm.git

diff --git a/components/hmysql/hSqlite3.ml b/components/hmysql/hSqlite3.ml
index 80c939ac8..20e494511 100644
--- a/components/hmysql/hSqlite3.ml
+++ b/components/hmysql/hSqlite3.ml
@@ -51,16 +51,17 @@ let quick_connect ?host ?(database = "sqlite") ?port ?password ?user () =
   let username = Helm_registry.get "user.name" in
   let tmp_db_name =
     if HExtlib.is_dir "/dev/shm/" && HExtlib.writable_dir "/dev/shm/" then
-      (HLog.debug "using /dev/shm to store the working copy of the db";
+      ((*HLog.debug "using /dev/shm to store the working copy of the db";*)
       "/dev/shm/matita.db." ^ username ^ "." ^ string_of_int (Unix.getpid ()))
     else
-      (HLog.debug "/dev/shm not available";
+      ((*HLog.debug "/dev/shm not available";*)
       Helm_registry.get "matita.basedir" ^ "/matita.db." ^ username ^ "." ^
         string_of_int (Unix.getpid ()))
   in
   let db_name = Helm_registry.get "matita.basedir" ^ "/" ^ database ^ ".db" in
-  (* XXX big hack XXX *)
-  let standard_db_name = "/usr/share/matita/metadata.db" in
+  let standard_db_name = 
+    Helm_registry.get "matita.rt_base_dir" ^ "/metadata.db" 
+  in
   let cp_to_ram_cmd = 
     if HExtlib.is_regular db_name then
       "cp " ^ db_name ^ " " ^ tmp_db_name 
@@ -73,7 +74,20 @@ let quick_connect ?host ?(database = "sqlite") ?port ?password ?user () =
     ignore (Sys.command ("mv " ^ tmp_db_name ^ " " ^ db_name)) 
   in
   at_exit mv_to_disk_cmd;
-  Some (Sqlite3.db_open tmp_db_name)
+  let db = Sqlite3.db_open tmp_db_name in
+  (* attach the REGEX function *)
+  Sqlite3.create_fun_2 db "REGEXP"
+      (fun s rex -> 
+         match rex, s with
+         | Sqlite3.Data.TEXT rex, Sqlite3.Data.BLOB s
+         | Sqlite3.Data.TEXT rex, Sqlite3.Data.TEXT s ->
+             let r = Str.regexp rex in
+             if Str.string_match r s 0 then 
+               Sqlite3.Data.INT 1L 
+             else 
+               Sqlite3.Data.INT 0L
+         | _ -> raise (Error "wrong types to 'REGEXP'"));
+  Some db
 ;;
 
 let disconnect db =
@@ -177,3 +191,5 @@ let errno = function
 ;;
 
 let isMysql = false
+
+let escape_string_for_like = ("ESCAPE \"\\\"" : ('a,'b,'c,'a) format4);;