From 3cc4326e6f0b2865a9506f024b20bb3ba406077a Mon Sep 17 00:00:00 2001 From: natile Date: Tue, 8 Oct 2002 08:56:51 +0000 Subject: [PATCH] Db connection ok! --- helm/ocaml/mathql_interpreter/.depend | 12 ++++++------ helm/ocaml/mathql_interpreter/Makefile | 4 ++-- helm/ocaml/mathql_interpreter/dbconn.ml | 2 +- helm/ocaml/mathql_interpreter/mqint.ml | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend index 1440e28c7..2a532e6dd 100644 --- 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 14cc838f9..7a45ecdf2 100644 --- 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 a4bd7fe3b..17264f5cb 100644 --- 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 af3298cce..84b3522f2 100644 --- 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 [] -> [] -- 2.39.2