...

[helm.git] / helm / ocaml / mathql_interpreter / mqint.ml

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index 8062b11e69692e6254e2ec78ef2b520c52380083..64aea7d3373d682aada9ba33cf6604bcfd31ceb8 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -54,7 +54,7 @@ let check () =
    let status = Dbconn.pgc () 
    in ()
 
-let stat = ref false
+let stat = ref true
 
 let set_stat b = stat := b
 
@@ -64,13 +64,11 @@ let postgres_db = "postgres"
 
 let galax_db = "galax"
 
-let dbname = ref postgres_db
+let dbname = ref galax_db
 
 let set_database s = 
-    match s with 
-      postgres_db -> dbname := s
-    | galax_db -> dbname := s
-    | _ -> raise (Invalid_argument s)
+    if s = postgres_db || s = galax_db then dbname := s
+    else raise (Invalid_argument s)
 
 let get_database () = ! dbname
 
@@ -89,7 +87,7 @@ let rec exec_set_exp c = function
         let ll1 = string_of_int (List.length rs1) in
         let ll2 = string_of_int (List.length rs2) in
         let diff = string_of_float (after -. before) in
-       if ! stat then
+       if !stat then
         (print_endline("INTERSECT(" ^ ll1 ^ "," ^ ll2 ^ ") = " ^ string_of_int (List.length res) ^
          ": " ^ diff ^ "s");
          flush stdout);
@@ -99,7 +97,7 @@ let rec exec_set_exp c = function
        let res = union_ex (exec_set_exp c sexp1) (exec_set_exp c sexp2) in
        let after = Sys.time() in
        let diff = string_of_float (after -. before) in
-        if ! stat then
+        if !stat then
        (print_endline ("UNION: " ^ diff ^ "s");
          flush stdout);
         res                    
@@ -123,7 +121,7 @@ let rec exec_set_exp c = function
        res
    | MathQL.Relation (rop, path, sexp, attl) -> 
         let before = Sys.time() in
-       if ! dbname = "db-postgres" then
+       if ! dbname = postgres_db then
         (let res = relation_ex rop path (exec_set_exp c sexp) attl in
         if ! stat then 
         (print_string ("RELATION " ^ (List.hd path) ^ " = " ^ string_of_int(List.length res) ^ ": ");
@@ -132,7 +130,7 @@ let rec exec_set_exp c = function
          res)
        else
         (let res = relation_galax_ex rop path (exec_set_exp c sexp) attl in
-         if ! stat then
+         if !stat then
          (print_string ("RELATION-GALAX " ^ (List.hd path) ^ " = " ^ string_of_int(List.length res) ^ ": ");
           print_endline (string_of_float (Sys.time() -. before) ^ "s");
           flush stdout);