In-Reply-To header field. Note extra list.rev in convert
git-svn-id: file:///srv/svn/repo/kosuzu/trunk@41 eb64cd80-c68d-6f47-b6a3-0ada418499da
This commit is contained in:
47
lib/text.ml
47
lib/text.ml
@@ -22,11 +22,19 @@ let blank ?(id=(Id.generate ())) () = {
|
||||
let compare = Stdlib.compare
|
||||
let newest a b = Date.(compare a.date b.date)
|
||||
let oldest a b = Date.(compare b.date a.date)
|
||||
let str key m = try String_map.find (String.lowercase_ascii key) m.string_map with Not_found -> ""
|
||||
let set key m = try String_map.find (String.lowercase_ascii key) m.stringset_map with Not_found -> String_set.empty
|
||||
let str_set key m = String_set.to_string @@ set key m
|
||||
let with_str_set ?(separator=String_set.of_csv_string) m key str = { m with
|
||||
stringset_map = String_map.add (String.lowercase_ascii key) (separator str) m.stringset_map
|
||||
|
||||
let str key m =
|
||||
try String_map.find (String.lowercase_ascii key) m.string_map
|
||||
with Not_found -> ""
|
||||
|
||||
let set key m =
|
||||
try String_map.find (String.lowercase_ascii key) m.stringset_map
|
||||
with Not_found -> String_set.empty
|
||||
|
||||
let with_str_set ?(separator=String_set.of_csv_string) m key str =
|
||||
{ m with
|
||||
stringset_map = String_map.add (String.lowercase_ascii key) (separator str)
|
||||
m.stringset_map
|
||||
}
|
||||
|
||||
let with_kv x (k,v) =
|
||||
@@ -37,12 +45,12 @@ let with_kv x (k,v) =
|
||||
| "id" -> (match v with "" -> x | s -> { x with id = s })
|
||||
| "author"
|
||||
| "authors" -> { x with authors = Person.Set.of_string (trim v)}
|
||||
| "date" -> { x with date = Date.{ x.date with created = Date.of_string v }}
|
||||
| "date-edited"-> { x with date = Date.{ x.date with edited = Date.of_string v }}
|
||||
| "date" -> { x with date = Date.{ x.date with created = Date.of_string v }}
|
||||
| "date-edited"-> { x with date = Date.{ x.date with edited = Date.of_string v }}
|
||||
| "licences" | "topics" | "keywords" | "series" as k -> with_str_set x k v
|
||||
| "references" -> with_str_set
|
||||
~separator:(fun x -> String_set.map (fun x -> String.(sub x 1 (length x-2)))
|
||||
(String_set.of_ssv_string x))
|
||||
| "references" | "in-reply-to" -> with_str_set
|
||||
~separator:(fun x -> String_set.map
|
||||
(fun x -> String.(sub x 1 (length x-2))) (String_set.of_ssv_string x))
|
||||
x k v
|
||||
| k -> { x with string_map = String_map.add k (trim v) x.string_map }
|
||||
|
||||
@@ -69,21 +77,26 @@ let of_string s =
|
||||
if note.id <> Id.nil then Ok note else Error "Missing ID header"
|
||||
with _ -> Error ("Failed parsing" ^ s)
|
||||
|
||||
let to_string x =
|
||||
let str_set key m = String_set.to_string @@ set key m
|
||||
|
||||
let to_string x =
|
||||
let has_len v = String.length v > 0 in
|
||||
let s field value = if has_len value then field ^ ": " ^ value ^ "\n" else "" in
|
||||
let a value = if Person.Set.is_empty value then "" else "Authors: " ^ Person.Set.to_string value ^ "\n" in
|
||||
let d field value = match value with "" -> "" | s -> field ^ ": " ^ Date.rfc_string s ^ "\n" in
|
||||
let a value = if Person.Set.is_empty value then ""
|
||||
else "Authors: " ^ Person.Set.to_string value ^ "\n" in
|
||||
let d field value = match value with "" -> ""
|
||||
| s -> field ^ ": " ^ Date.rfc_string s ^ "\n" in
|
||||
let rows = [
|
||||
s "ID" x.id;
|
||||
d "Date" x.date.Date.created;
|
||||
d "Edited" x.date.Date.edited;
|
||||
s "Title" x.title;
|
||||
d "Date" x.date.Date.created;
|
||||
d "Edited" x.date.Date.edited;
|
||||
s "Title" x.title;
|
||||
a x.authors;
|
||||
s "Licences" (str_set "licences" x);
|
||||
s "Topics" (str_set "topics" x);
|
||||
s "Keywords" (str_set "keywords" x);
|
||||
s "References"(str_set "references" x);
|
||||
s "References"(str_set "references" x); (*todo: add to output <>*)
|
||||
s "In-Reply-To"(str_set "in-reply-to" x);
|
||||
s "Series" (str_set "series" x);
|
||||
s "Abstract" (str "abstract" x);
|
||||
s "Alias" (str "Alias" x)
|
||||
|
||||
Reference in New Issue
Block a user