6c27c7c6fb
Basic unit renamed from Note to Text. New modular text-parser, internal to Logarion, for generic notation parsing. The default input format is now a much plainer text. Eliminated Meta module and generally lib/ modules. New Store interface, with additional information from Store. For example the converter can now check filesystem dates. Changed to filesystem hardlinks for tracking publications & indexing, instead of categories. New commands `publish [-i]` and `deindex [-u]`. Categories are ignored now. Logarion created texts have part of the UUID instead of a counter in their filename. New -i, --interactive flag for interactive creation & publication. Logarion's index re-written in Messagepack format. Removed `indices` command. They are generated during `convert`.
32 lines
1.2 KiB
OCaml
32 lines
1.2 KiB
OCaml
module Person = struct
|
|
type name_t = string
|
|
type address_t = Uri.t
|
|
type t = { name: name_t; addresses: address_t list }
|
|
let empty = { name = ""; addresses = [] }
|
|
let compare = Stdlib.compare
|
|
let to_string p = List.fold_left (fun a e -> a^" <"^Uri.to_string e^">") p.name p.addresses
|
|
let of_string s = match String.trim s with "" -> empty | s ->
|
|
match Re.Str.(split (regexp " *< *") s) with
|
|
| [] -> empty
|
|
| [n] -> let name = String.trim n in { empty with name }
|
|
| n::adds ->
|
|
let name = String.trim n in
|
|
let addresses = List.map (fun f -> Uri.of_string @@ String.(sub f 0 (length f -1))) adds in
|
|
{ name; addresses }
|
|
end
|
|
|
|
include Person
|
|
|
|
module Set = struct
|
|
include Set.Make(Person)
|
|
let to_string ?(pre="") ?(sep=", ") s =
|
|
let str = Person.to_string in
|
|
let j x a = match a, x with "",_ -> str x | _,x when x = Person.empty -> a | _ -> a^sep^str x in
|
|
fold j s pre
|
|
let of_string s = of_list (List.map Person.of_string (String_set.list_of_csv s))
|
|
|
|
let of_stringset s = String_set.fold (fun e a -> union (of_string e) a) s empty
|
|
let of_query q = of_stringset (fst q), of_stringset (snd q)
|
|
let predicate (inc, exl) set = not (disjoint inc set) && disjoint exl set
|
|
end
|