Db connection ok!

diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend
index 1440e28c74232d9369465469ef074b997b275a5e..2a532e6dd7f6d87352009d255bfb71984dcfb3a3 100644 (file)
--- a/helm/ocaml/mathql_interpreter/.depend
+++ b/helm/ocaml/mathql_interpreter/.depend
@@ -2,6 +2,8 @@ dbconn.cmo: dbconn.cmi
 dbconn.cmx: dbconn.cmi 
 utility.cmo: dbconn.cmi utility.cmi 
 utility.cmx: dbconn.cmx utility.cmi 
+union.cmo: union.cmi 
+union.cmx: union.cmi 
 relation.cmo: dbconn.cmi utility.cmi relation.cmi 
 relation.cmx: dbconn.cmx utility.cmx relation.cmi 
 diff.cmo: diff.cmi 
@@ -10,11 +12,9 @@ meet.cmo: meet.cmi
 meet.cmx: meet.cmi 
 sub.cmo: sub.cmi 
 sub.cmx: sub.cmi 
-union.cmo: union.cmi 
-union.cmx: union.cmi 
 intersect.cmo: intersect.cmi 
 intersect.cmx: intersect.cmi 
-mqint.cmo: context.cmo diff.cmi intersect.cmi meet.cmi relation.cmi sub.cmi \
-    union.cmi mqint.cmi 
-mqint.cmx: context.cmx diff.cmx intersect.cmx meet.cmx relation.cmx sub.cmx \
-    union.cmx mqint.cmi 
+mqint.cmo: context.cmo dbconn.cmi diff.cmi intersect.cmi meet.cmi \
+    relation.cmi sub.cmi union.cmi mqint.cmi 
+mqint.cmx: context.cmx dbconn.cmx diff.cmx intersect.cmx meet.cmx \
+    relation.cmx sub.cmx union.cmx mqint.cmi 

diff --git a/helm/ocaml/mathql_interpreter/Makefile b/helm/ocaml/mathql_interpreter/Makefile
index 14cc838f96ab79a26e44c071eea9da630c8f07e3..7a45ecdf29875251fbd88a3ac7c9b89c813571f0 100644 (file)
--- a/helm/ocaml/mathql_interpreter/Makefile
+++ b/helm/ocaml/mathql_interpreter/Makefile
@@ -2,9 +2,9 @@ PACKAGE = mathql_interpreter
 REQUIRES = helm-urimanager postgres unix helm-mathql
 PREDICATES =
 
-INTERFACE_FILES = dbconn.mli utility.mli relation.mli diff.mli meet.mli sub.mli union.mli intersect.mli mqint.mli
+INTERFACE_FILES = dbconn.mli utility.mli union.mli relation.mli diff.mli meet.mli sub.mli intersect.mli mqint.mli
 
-IMPLEMENTATION_FILES =  dbconn.ml utility.ml relation.ml diff.ml meet.ml sub.ml union.ml intersect.ml context.ml mqint.ml
+IMPLEMENTATION_FILES =  dbconn.ml utility.ml union.ml relation.ml diff.ml meet.ml sub.ml intersect.ml context.ml mqint.ml
 
 # $(INTERFACE_FILES:%.mli=%.ml)
 

diff --git a/helm/ocaml/mathql_interpreter/dbconn.ml b/helm/ocaml/mathql_interpreter/dbconn.ml
index a4bd7fe3bc51af6b785687c4c08de3a110fe8c01..17264f5cb17408e0526ec5f73e619965d04f2d16 100644 (file)
--- a/helm/ocaml/mathql_interpreter/dbconn.ml
+++ b/helm/ocaml/mathql_interpreter/dbconn.ml
@@ -46,7 +46,7 @@ exception DBInvalidConnection of string
  * passati come argomento
  *)
 (*let connection_param = "dbname=helm";;*)
-let connection_param = "host=dotto.cs.unibo.it dbname=helm user=helm";;
+let connection_param = "host=mowgli.cs.unibo.it dbname=helm user=helm";;
 
 (*
  * connessione al db

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index af3298cce4493df4696656db34c72393934b6cf0..84b3522f26ea49e324bee03f04a847935b613f11 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -322,7 +322,8 @@ and exec_boole_exp c = function
 (* valuta una MathQL.val_exp e ritorna un MathQL.value *)
 
 and exec_val_exp c = function
-   | MathQL.Const x -> let ol = List.sort compare x in 
+   | MathQL.Const x -> let
+   ol = List.sort compare x in 
                        let rec edup = function
                        
                           [] -> []