let from = "genLemma" in
let where =
Printf.sprintf "h_outer = \"%s\""
- (HMysql.escape (UriManager.string_of_uri outer)) in
+ (HSql.escape (UriManager.string_of_uri outer)) in
let query = Printf.sprintf "SELECT %s FROM %s WHERE %s" select from where in
- let result = HMysql.exec dbd query in
- let lemmas = HMysql.map ~f:(map inners) result in
+ let result = HSql.exec dbd query in
+ let lemmas = HSql.map ~f:(map inners) result in
let ranked = List.fold_left rank [] lemmas in
let ordered = List.rev (List.fast_sort compare ranked) in
filter_map_n filter 0 ordered
| None -> None
| Some str ->
match CicUtil.term_of_uri (UriManager.uri_of_string str) with
- | Cic.MutInd (uri, typeno, _) -> Some (uri, typeno)
+ | Cic.MutInd (uri, typeno, _) -> Some (uri, Some typeno)
+ | Cic.Const (uri, _) -> Some (uri, None)
| _ ->
raise (UriManager.IllFormedUri str)
in
let select, from = "source", "decomposables" in
let query = Printf.sprintf "SELECT %s FROM %s" select from in
- let decomposables = HMysql.map ~f:map (HMysql.exec dbd query) in
+ let decomposables = HSql.map ~f:map (HSql.exec dbd query) in
filter_map_n (fun _ x -> x) 0 decomposables
-