let out_tref r = pat (str_tref r)
-let out_pat p = out_tref p
+
+let rec out_sequence f = function
+ | [] -> sep "."
+ | [s] -> f s
+ | s :: tail -> f s ^ sep "," ^ out_sequence f tail
let out_order = function
| MQAsc -> sub2 "asc"
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_pat p
+ | MQPattern p -> key "pattern" ^ out_sequence 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 ")"
| MQSortedBy (l, o, f) -> sep "(" ^ out_list l ^ sub "sortedby" ^ out_func f ^ out_order o ^ sep ")"
| 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" ^ str s
+ | MQReference s -> key "reference" ^ out_sequence str s
| MQMinimize l -> key "minimize" ^ out_list l
let out_query = function
(* HTML representation of a query result *)
-let rec out_list = function
+let rec out_res_list = function
| [] -> ""
- | u :: l -> res u ^ nl () ^ out_list l
+ | u :: l -> res u ^ nl () ^ out_res_list l
let out_result qr =
par () ^ "Result:" ^ nl () ^
match qr with
- | MQRefs l -> out_list l
+ | MQRefs l -> out_res_list l
(* Converting functions *)
let parse_text ch =
let lexbuf = Lexing.from_channel ch in
MQueryTParser.query MQueryTLexer.qtoken lexbuf
+
+(* implementazione manuale di tref_uref da controllare
+
+let split s =
+ try
+ let i = Str.search_forward (Str.regexp_string ":/") s 0 in
+ let p = Str.string_before s i in
+ let q = Str.string_after s (i + 2) in
+ (p, q)
+ with
+ Not_found -> (s, "")
+
+let encode = function
+ | Str.Text s -> MQBC s
+ | Str.Delim s ->
+ if s = "?" then MQBQ else
+ if s = "*" then MQBS else
+ if s = "**" then MQBSS else
+ if s = "/" then MQBD else MQBC s
+
+let tref_uref (u, i) =
+ let s = UriManager.string_of_uri u in
+ match split s with
+ | (p, q) ->
+ let rx = Str.regexp "\?\|\*\*\|\*\|/" in
+ let l = Str.full_split rx q in
+ (Some p, List.map encode l, i)
+
+*)