X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql%2FmQueryUtil.ml;h=8943e5675652f23f2b60c64b92c902575a8d4652;hb=1d4de3a17c0a41781cc8e415361d228ded4f1d8f;hp=cb60eff629cf5fa90ef1f967e56e00875951178c;hpb=56e6fd40e7723c2b0301e3fcdb1273692c42e590;p=helm.git

diff --git a/helm/ocaml/mathql/mQueryUtil.ml b/helm/ocaml/mathql/mQueryUtil.ml
index cb60eff62..8943e5675 100644
--- a/helm/ocaml/mathql/mQueryUtil.ml
+++ b/helm/ocaml/mathql/mQueryUtil.ml
@@ -34,8 +34,9 @@
 (******************************************************************************)
 
 open MathQL
+open MQueryHTML
 
-(* string linearization of a reference *)
+(* string linearization of a reference **************************************)
 
 let str_btoken = function
    | MQBC s -> s
@@ -44,6 +45,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,60 +58,25 @@ 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
-;;
-
-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 ^
-      ")"
-;;
-
-(* raw HTML representation *)
-
-let key s = "<font color=\"blue\">" ^ s ^ " </font>"
-
-let sub s = "<font color=\"blue\"> " ^ s ^ " </font>"
-
-let sub2 s = "<font color=\"blue\">" ^ s ^ "</font>"
+   str_prot p ^ ":/" ^ str_body b ^ str_frag false str_ftoken i
 
-let sym s = s
+let xp_str_tref (p, b, i) = 
+   str_prot p ^ ":/" ^ str_body b ^ str_frag true str_ftoken i
 
-let sep s = s
-
-let str s = "<font color=\"red\">'" ^ s ^ "'</font>"
-
-let pat s = "<font color=\"red\">\"" ^ s ^ "\"</font>"
-
-let res s = "<font color=\"brown\">\"" ^ s ^ "\"</font>"
-
-let nl () = "<br>"
+let str_uref (u, i) =
+   UriManager.string_of_uri u ^ str_frag false string_of_int i
 
-let par () = "<p>"
+let xp_str_uref (u, i) =
+   UriManager.string_of_uri u ^ str_frag true string_of_int i
 
-(* HTML representation of a query *)
+(* HTML representation of a query ********************************************)
 
 let out_rvar s = sym s
 
@@ -115,11 +86,10 @@ 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
-  | s :: tail -> f s ^ sep "," ^ out_sequence f tail
+  | s :: tail -> f s ^ sep ", " ^ out_sequence f tail
 
 let out_order = function
    | MQAsc  -> sub2 "asc"
@@ -171,7 +141,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,12 +150,11 @@ 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
 
-(* HTML representation of a query result *)
+(* HTML representation of a query result ************************************)
 
 let rec out_res_list = function 
    | []     -> ""
@@ -196,7 +165,7 @@ let out_result qr =
    match qr with
       | MQRefs l -> out_res_list l
 
-(* Converting functions *)
+(* Converting functions *****************************************************)
 
 let tref_uref u =
    let s = str_uref u in