mathQL modified, stderr corrected to stdout im mathql_interpreter,

[helm.git] / helm / ocaml / mathql / mQueryUtil.ml

diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml
index cb60eff629cf5fa90ef1f967e56e00875951178c..0cf8ebe087653b2d4365c0e33628fafa7a1049eb 100644 (file)
--- a/helm/ocaml/mathql/mQueryUtil.ml
+++ b/helm/ocaml/mathql/mQueryUtil.ml
@@ -44,6 +44,11 @@ let str_btoken = function
    | MQBS   -> "*"
    | MQBSS  -> "**"
 
+let str_ftoken = function
+   | MQFC i -> string_of_int i
+   | MQFS   -> "*"
+   | MQFSS  -> "**"
+
 let str_prot = function
    | Some s -> s
    | None   -> "*"
@@ -52,36 +57,23 @@ let rec str_body = function
    | [] -> ""
    | head :: tail -> str_btoken head ^ str_body tail 
 
-let str_frag l = 
- match l with
-    [] -> ""
-  | l ->
-     let str_ftokens =
-      List.fold_left
-       (fun i t ->
-         i ^
-          match t with
-             MQFC i -> "/" ^ string_of_int i
-           | MQFS   -> "/*"
-           | MQFSS  -> "/**"
-       ) "" l
-     in
-      "#xpointer(1" ^ str_ftokens ^ ")"
-;;
+let str_frag xpointer f l = 
+   let sfi = List.fold_left (fun l0 t0 -> l0 ^ "/" ^ f t0) "" l in
+   if sfi = "" then "" else
+   if xpointer then "#xpointer(1" ^ sfi ^ ")" else
+                    "#1" ^ sfi
 
 let str_tref (p, b, i) = 
-   str_prot p ^ ":/" ^ str_body b ^ str_frag i
-;;
+   str_prot p ^ ":/" ^ str_body b ^ str_frag false str_ftoken i
+
+let xp_str_tref (p, b, i) = 
+   str_prot p ^ ":/" ^ str_body b ^ str_frag true str_ftoken i
 
 let str_uref (u, i) =
- UriManager.string_of_uri u ^
-  match i with
-     [] -> ""
-   | l ->
-     "#xpointer(1" ^
-      List.fold_left (fun i n -> i ^ "/" ^ string_of_int n) "" l ^
-      ")"
-;;
+   UriManager.string_of_uri u ^ str_frag false string_of_int i
+
+let xp_str_uref (u, i) =
+   UriManager.string_of_uri u ^ str_frag true string_of_int i
 
 (* raw HTML representation *)
 
@@ -115,7 +107,6 @@ let out_lvar s = sep "%" ^ sym s
 
 let out_tref r = pat (str_tref r) 
 
-
 let rec out_sequence f = function
   | []        -> sep "."
   | [s]       -> f s
@@ -171,7 +162,7 @@ and out_list = function
       key "select" ^ out_rvar r ^ sub "in" ^ out_list l ^ sub "where" ^ out_bool b
    | MQUse (l, v) -> key "use" ^ out_list l ^ sub "position" ^ out_svar v
    | MQUsedBy (l, v) -> key "usedby" ^ out_list l ^ sub "position" ^ out_svar v
-   | MQPattern p -> key "pattern" ^ out_sequence out_tref p
+   | MQPattern p -> key "pattern" ^ out_tref p
    | MQUnion (l1, l2) -> sep "(" ^ out_list l1 ^ sub "union" ^ out_list l2 ^ sep ")"
    | MQIntersect (l1, l2) -> sep "(" ^ out_list l1 ^ sub "intersect" ^ out_list l2 ^ sep ")"
    | MQDiff (l1, l2) -> sep "(" ^ out_list l1 ^ sub "diff" ^ out_list l2 ^ sep ")"
@@ -180,7 +171,6 @@ and out_list = function
    | MQListLVar v -> out_lvar v
    | MQLetIn (v, l1, l2) -> key "let" ^ out_lvar v ^ sub "be" ^ out_list l1 ^ sub "in" ^ out_list l2
    | MQReference s -> key "reference" ^ out_sequence str s
-   | MQMinimize l -> key "minimize" ^ out_list l
 
 let out_query = function
    | MQList l -> out_list l