From: natile <??>
Date: Tue, 8 Oct 2002 10:07:45 +0000 (+0000)
Subject: Relation ok!
X-Git-Tag: new_mathql_before_first_merge~15
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=994ea48005cd1290993f6825217a3acaabd766fa;p=helm.git

Relation ok!
---

diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend
index 2a532e6dd..8106a0f5e 100644
--- a/helm/ocaml/mathql_interpreter/.depend
+++ b/helm/ocaml/mathql_interpreter/.depend
@@ -4,8 +4,8 @@ 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 
+relation.cmo: dbconn.cmi union.cmi utility.cmi relation.cmi 
+relation.cmx: dbconn.cmx union.cmx utility.cmx relation.cmi 
 diff.cmo: diff.cmi 
 diff.cmx: diff.cmi 
 meet.cmo: meet.cmi 
diff --git a/helm/ocaml/mathql_interpreter/relation.ml b/helm/ocaml/mathql_interpreter/relation.ml
index 7e35aad75..2fbb24bf8 100644
--- a/helm/ocaml/mathql_interpreter/relation.ml
+++ b/helm/ocaml/mathql_interpreter/relation.ml
@@ -23,7 +23,7 @@
  * http://www.cs.unibo.it/helm/.
  *)
 
-
+open Union;;
 open Dbconn;;
 open Utility;;
 (*
@@ -53,23 +53,29 @@ let _ = print_string ("RELATION "^usek)
 and t = Unix.time () in
 let result =
  let c = pgc () in
- List.sort
-compare      
+
+let rset_list =  (* lista di singoletti:resource_set di un elemento *)
 (List.fold_left (fun acc (uri,l) ->
                          let tv = pgresult_to_string (c#exec ("select id from registry where uri='" ^ uri ^ "'"))
                          in
                           let qq = "select uri, context from t" ^ tv ^ " where prop_id='" ^ usek ^ "' order by uri asc"
                           in
                            let res = c#exec qq in
+			     
                             (List.map
-                             (function [uri;context] -> (uri,[[(vvar,[context])]])
+                             (function [uri;context] -> [(uri,[[(vvar,[context])]])]
                                        | _ -> assert false ) 
 	                      res#get_list) @ acc
-	    )		      
+			    	    )		      
             [] rset			      
 )
-(*Come faccio a togliere i duplicati????*)       
-
+in                    
+			     let rec edup = function
+			        [] -> []
+			      | rs1::tl -> union_ex rs1 (edup tl) 
+                             in 
+			      edup rset_list 
+			       
 
 in
 print_string (" = " ^ string_of_int (List.length result) ^ ": ") ;