Changeset 38 in code for trunk

Timestamp:

Dec 4, 2022, 7:18:52 PM (2 years ago)

Author:

fox

Message:

Support References field

Location:

trunk

Files:

• cli/html.ml (modified) (4 diffs)
• header (modified) (1 diff)
• lib/text.ml (modified) (3 diffs)

trunk/cli/html.ml

@@ -47 +47 @@
 module HtmlConverter = struct
         include Converter.Html
-        let angled_uri u a = if String.sub u 0 10 <> "urn:txtid:" then
-                angled_uri u a else angled_uri (String.(sub u 10 (length u - 10)) ^ ext) a
+        let angled_uri u a =
+                if try String.sub u 0 10 = "urn:txtid:" with Invalid_argument _ -> false
+                then angled_uri (String.(sub u 10 (length u - 10)) ^ ext) a else angled_uri u a
 end
 
@@ -60 +61 @@
 (*      let author acc auth = sep_append acc Person.(auth.name ^ " ") in*)
         let authors = Person.Set.to_string text.authors in
-        let keywords = str_set "keywords" text in
         let header =
                 let time x = Printf.sprintf {|<time datetime="%s">%s</time>|}
@@ -69 +69 @@
                                 sep_append a (List.fold_left (fun a t -> sep_append ~sep:" > " a (topic_link (List.hd ts) t)) "" ts) in
                         String_set.fold to_linked x "" in
+                let ref_links x =
+                        let link l = HtmlConverter.angled_uri (String.(sub l 1 (length l-2))) "" in
+                        String_set.fold (fun r a -> sep_append a (link r)) x ""
+                in
                 "<article><header><dl>"
                 ^ opt_kv "Title:" text.title
@@ -75 +79 @@
                 ^ opt_kv "Series:" (str_set "series" text)
                 ^ opt_kv "Topics:" (topic_links (set "topics" text))
-                ^ opt_kv "Keywords:" keywords
                 ^ opt_kv "Id:" text.id
+                ^ opt_kv "References:" (ref_links (set "references" text))
                 ^ {|</dl></header><pre style="white-space:pre-wrap">|} in
         wrap conversion htm text.title ((T.of_string text.body header) ^ "</pre></article>")

trunk/header

@@ -5 +5 @@
 Authors: List of name with optional set of <address>
 Date-edited: ISO8601, use only when text edited
+References: list of text ID links
 
 A blank line must follow the last header field.

trunk/lib/text.ml

@@ -26 +26 @@
 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 m key str = { m with stringset_map = String_map.add (String.lowercase_ascii key) (String_set.of_string str) m.stringset_map }
+let with_str_set m key str = { m with
+        stringset_map = String_map.add (String.lowercase_ascii key) (String_set.of_string str) m.stringset_map
+        }
 
 let with_kv x (k,v) =
@@ -38 +40 @@
         | "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
+        | "licences" | "topics" | "keywords" | "references" | "series" as k -> with_str_set x k v
         | k -> { x with string_map = String_map.add k (trim v) x.string_map }
 
@@ -78 +80 @@
                 s "Topics"   (str_set "topics" x);
                 s "Keywords" (str_set "keywords" x);
+                s "References"(str_set "references" x);
                 s "Series"   (str_set "series" x);
                 s "Abstract" (str "abstract" x);