After Union and Relation

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

diff --git a/helm/ocaml/mathql_interpreter/use.ml b/helm/ocaml/mathql_interpreter/use.ml
index 93ed9a8a4a722e1ca329fd803fa57386271d12f3..654c3e69b16e046a4836f2630f18dfded67589d2 100644 (file)
--- a/helm/ocaml/mathql_interpreter/use.ml
+++ b/helm/ocaml/mathql_interpreter/use.ml
@@ -44,66 +44,25 @@ open Dbconn;;
  * output: string list list; lista su cui e' stato eseguito il 
  *                           comando USE/USED BY
  *)
-let use_ex alist asvar usek =
- (*(*let _ = print_string ("USE ")
- and t = Unix.time () in*)
- let result =
-  let c = pgc ()
-  in
-   [ (List.hd alist) @ [asvar] ]
-   @
-   Sort.list
-    (fun l m -> List.hd l < List.hd m)
-    (List.fold_left
-     (fun parziale xres ->
-      (*let r1 = helm_property_id usek
-      and r2 = helm_property_id "position"
-      and r3 = helm_property_id "occurrence"
-      in
-       let qq = "select distinct t" ^ r3 ^ ".att1, t" ^ r2 ^ ".att1 " ^
-        "from t" ^ r3 ^ ", t" ^ r2 ^ ", t" ^ r1 ^ " " ^
-        "where " ^ "t" ^ r1 ^ ".att0 = '" ^ (List.hd xres) ^ "' and t" ^ r1 ^
-        ".att1 = t" ^ r2 ^ ".att0 and t" ^ r1 ^ ".att1 = t" ^ r3 ^
-        ".att0 order by t" ^ r3 ^ ".att1 asc"*)
-       let tv = pgresult_to_string (c#exec ("select id from registry where uri='" ^ (List.hd xres) ^ "'")) in
-        let _ = print_endline ("DEBUG (use.ml): " ^ tv) in
-        let qq = "select uri, context from t" ^ tv ^ " where back_for='" ^ usek ^ "'" in
-         let res = c#exec qq in
-          (List.map
-           (fun l -> [List.hd l] @ List.tl xres @ List.tl l)
-           res#get_list
-          )
-          @
-          parziale
-     )
-     []
-     (List.tl alist)
-    )
-  in
-   (*let _ = print_endline (string_of_float (Unix.time () -. t)); flush stdout in*)
+let get_prop_id prop =
+ if prop="refObj" then "F"
+  else if prop="backPointer" then "B"
+   else assert false
+   ;;
+   
+ 
+let relation_ex rop path rset attl =
+ let usek = get_prop_id (List.hd path) in 
 
- *)
-let module S = Mathql_semantics in
-let _ = print_string ("USE ")
+let _ = print_string ("RELATION "^usek)
 and t = Unix.time () in
 let result =
  let c = pgc () in
   Sort.list
-   (fun {S.uri = uri1} {S.uri = uri2} -> uri1 < uri2)
+   (fun (uri1-> uri1 < uri2)
    (List.fold_left
-    (fun parziale {S.uri = uri ; S.attributes = attributes} ->
+    (fun parziale (uri,aset)->
      print_string uri ;
-     (* RSSDB
-     let r1 = helm_property_id usek
-     and r2 = helm_property_id "position"
-     and r3 = helm_property_id "occurrence"
-     in
-      let qq = "select distinct t" ^ r3 ^ ".att1, t" ^ r2 ^ ".att1 " ^
-       "from t" ^ r3 ^ ", t" ^ r2 ^ ", t" ^ r1 ^ " " ^
-       "where " ^ "t" ^ r1 ^ ".att0 = '" ^ (List.hd xres) ^ "' and t" ^ r1 ^
-       ".att1 = t" ^ r2 ^ ".att0 and t" ^ r1 ^ ".att1 = t" ^ r3 ^
-       ".att0 order by t" ^ r3 ^ ".att1 asc"
-      *)
       let tv =
        pgresult_to_string
         (c#exec ("select id from registry where uri='" ^ uri ^ "'"))
@@ -120,7 +79,7 @@ let result =
         ) res#get_list
        ) @
        parziale
-    ) [] alist
+    ) [] rset
    )
 in
 print_string (" = " ^ string_of_int (List.length result) ^ ": ") ;