update in ground_2 and basic_2

[helm.git] / helm / software / components / hmysql / hSqlite3.ml

diff --git a/helm/software/components/hmysql/hSqlite3.ml b/helm/software/components/hmysql/hSqlite3.ml
index c6ba66c2e3f52f217f53daf90c343edd7a93d781..310893ac5af2d10589d86f291844d359aafbcd82 100644 (file)
--- a/helm/software/components/hmysql/hSqlite3.ml
+++ b/helm/software/components/hmysql/hSqlite3.ml
@@ -103,7 +103,7 @@ let quick_connect
     else
       db_name
   in
-  HExtlib.mkdir (Filename.dirname db_open);
+  HExtlib.mkdir (Filename.dirname db_to_open);
   let db = Sqlite3.db_open db_to_open in
   (* attach the REGEX function *)
   Sqlite3.create_fun2 db "REGEXP"
@@ -114,11 +114,12 @@ let quick_connect
          | 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 
+               Sqlite3.Data.INT Int64.one 
              else 
-               Sqlite3.Data.INT 0L
+               Sqlite3.Data.INT Int64.zero
          | _ -> raise (Error "wrong types to 'REGEXP'")
-        with exn -> HLog.error (Printexc.to_string exn); raise exn);
+        with Sys.Break -> Sqlite3.Data.INT Int64.zero
+          | exn -> HLog.error (Printexc.to_string exn); raise exn);
   Some db
 ;;