let key s = "<font color=\"blue\">" ^ s ^ " </font>"
-let sym s = s ^ " "
+let sub s = "<font color=\"blue\"> " ^ s ^ " </font>"
+
+let sub2 s = "<font color=\"blue\">" ^ s ^ "</font>"
+
+let sym s = s
let sep s = s
-let str s = "<font color=\"red\">'" ^ s ^ "' </font>"
+let str s = "<font color=\"red\">'" ^ s ^ "'</font>"
-let pat s = "<font color=\"red\">\"" ^ s ^ "\" </font>"
+let pat s = "<font color=\"red\">\"" ^ s ^ "\"</font>"
-let res s = "<font color=\"brown\">\"" ^ s ^ "\" </font>"
+let res s = "<font color=\"brown\">\"" ^ s ^ "\"</font>"
let nl () = "<br>"
let out_svar s = sep "$" ^ sym s
+let out_lvar s = sep "%" ^ sym s
+
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"
+ | MQDesc -> sub2 "desc"
let out_func = function
- | MQName -> key "name"
+ | MQName -> key "name"
+ | MQTheory -> key "theory"
+ | MQTitle -> key "title"
+ | MQContributor -> key "contributor"
+ | MQCreator -> key "creator"
+ | MQPublisher -> key "publisher"
+ | MQSubject -> key "subject"
+ | MQDescription -> key "description"
+ | MQDate -> key "date"
+ | MQType -> key "type"
+ | MQFormat -> key "format"
+ | MQIdentifier -> key "identifier"
+ | MQLanguage -> key "language"
+ | MQRelation -> key "relation"
+ | MQSource -> key "source"
+ | MQCoverage -> key "coverage"
+ | MQRights -> key "rights"
+ | MQInstitution -> key "institution"
+ | MQContact -> key "contact"
+ | MQFirstVersion -> key "firstversion"
+ | MQModified -> key "modified"
let out_str = function
- | MQCons s -> str s
- | MQRVar s -> out_rvar s
- | MQSVar s -> out_svar s
- | MQFunc (f, r) -> out_func f ^ out_rvar r
- | MQMConclusion -> key "mainconclusion"
- | MQConclusion -> key "conclusion"
+ | MQCons s -> str s
+ | MQStringRVar s -> out_rvar s
+ | MQStringSVar s -> out_svar s
+ | MQFunc (f, r) -> out_func f ^ out_rvar r
+ | MQMConclusion -> key "mainconclusion"
+ | MQConclusion -> key "inconclusion"
let rec out_bool = function
| MQTrue -> key "true"
| MQFalse -> key "false"
- | MQIs (s, t) -> out_str s ^ key "is" ^ out_str t
+ | MQIs (s, t) -> out_str s ^ sub "is" ^ out_str t
| MQNot b -> key "not" ^ out_bool b
- | MQAnd (b1, b2) -> sep "(" ^ out_bool b1 ^ key "and" ^ out_bool b2 ^ sep ")"
- | MQOr (b1, b2) -> sep "(" ^ out_bool b1 ^ key "or" ^ out_bool b2 ^ sep ")"
-
-let rec out_list = function
+ | MQAnd (b1, b2) -> sep "(" ^ out_bool b1 ^ sub "and" ^ out_bool b2 ^ sep ")"
+ | MQOr (b1, b2) -> sep "(" ^ out_bool b1 ^ sub "or" ^ out_bool b2 ^ sep ")"
+ | MQSubset (l1, l2) -> sep "(" ^ out_list l1 ^ sub "subset" ^ out_list l2 ^ sep ")"
+ | MQSetEqual (l1, l2) -> sep "(" ^ out_list l1 ^ sub "setequal" ^ out_list l2 ^ sep ")"
+
+and out_list = function
| MQSelect (r, l, b) ->
- key "select" ^ out_rvar r ^ key "in" ^ out_list l ^ key "where" ^ out_bool b
- | MQUse (l, v) -> key "use" ^ out_list l ^ key "position" ^ out_svar v
- | MQUsedBy (l, v) -> key "usedby" ^ out_list l ^ key "position" ^ out_svar v
- | MQPattern p -> key "pattern" ^ out_pat p
- | MQUnion (l1, l2) -> sep "(" ^ out_list l1 ^ key "union" ^ out_list l2 ^ sep ")"
- | MQIntersect (l1, l2) -> sep "(" ^ out_list l1 ^ key "intersect" ^ out_list l2 ^ sep ")"
+ 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
+ | 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 ")"
+ | MQListRVar v -> out_rvar v
+ | 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" ^ 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 *)
-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)
+
+*)
projects / helm.git / blobdiff