debian release -3

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

diff --git a/helm/ocaml/mathql_interpreter/select.ml b/helm/ocaml/mathql_interpreter/select.ml
index 772f6964e9e71a8ba379c272a6be4b364130e609..c25ea26254fb9efaa45709efb7818d62a1bf5d71 100644 (file)
--- a/helm/ocaml/mathql_interpreter/select.ml
+++ b/helm/ocaml/mathql_interpreter/select.ml
@@ -48,10 +48,10 @@ let stringeval env =
   |  MQFunc (f, rvar) ->
       let {S.uri = uri} = List.assoc rvar env in
        apply_func f uri
-  |  MQSRVar rvar ->
+  |  MQStringRVar rvar ->
       let {S.uri = uri} = List.assoc rvar env in
        uri
-  |  MQSSVar svar ->
+  |  MQStringSVar svar ->
       let (_,{S.attributes = attributes}) = List.hd env in
        List.assoc svar attributes
   |  MQMConclusion ->
@@ -92,7 +92,12 @@ let rec is_good env =
       in
        let ul1 = set_of_result (None,!execute env q1) in
        let ul2 = set_of_result (None,!execute env q2) in
-prerr_endline ("MQSETEQUAL(" ^ string_of_int (List.length (!execute env q1)) ^ ">" ^ string_of_int (List.length ul1) ^ "," ^ string_of_int (List.length (!execute env q2)) ^ ">" ^ string_of_int (List.length ul2) ^ ")") ; flush stderr ;
+       print_endline ("MQSETEQUAL(" ^ 
+           string_of_int (List.length (!execute env q1)) ^ ">" ^
+          string_of_int (List.length ul1) ^ "," ^
+          string_of_int (List.length (!execute env q2)) ^ ">" ^
+          string_of_int (List.length ul2) ^ ")") ;
+       flush stdout ;
         (try
           List.fold_left2 (fun b uri1 uri2 -> b && uri1=uri2) true ul1 ul2
          with
@@ -110,7 +115,12 @@ prerr_endline ("MQSETEQUAL(" ^ string_of_int (List.length (!execute env q1)) ^ "
       in
        let ul1 = set_of_result (None,!execute env q1) in
        let ul2 = set_of_result (None,!execute env q2) in
-prerr_endline ("MQSUBSET(" ^ string_of_int (List.length (!execute env q1)) ^ ">" ^ string_of_int (List.length ul1) ^ "," ^ string_of_int (List.length (!execute env q2)) ^ ">" ^ string_of_int (List.length ul2) ^ ")") ; flush stderr ;
+        print_endline ("MQSUBSET(" ^ 
+       string_of_int (List.length (!execute env q1)) ^ ">" ^
+       string_of_int (List.length ul1) ^ "," ^
+       string_of_int (List.length (!execute env q2)) ^ ">" ^
+       string_of_int (List.length ul2) ^ ")") ;
+       flush stdout ;
         let rec is_subset s1 s2 =
          match s1,s2 with
             [],_ -> true