Changeset 39 in code for trunk/lib

Timestamp:

Dec 12, 2022, 10:52:55 PM (2 years ago)

Author:

fox

Message:

Read References field; referred by listing; test & tidy documentation

Location:

trunk/lib

Files:

• id.ml (modified) (1 diff)
• reference_set.ml (added)
• string_set.ml (modified) (1 diff)
• text.ml (modified) (2 diffs)

trunk/lib/id.ml

@@ -13 +13 @@
 
 type t = string
-let compare = String.compare    
+let compare = String.compare
 let nil = ""
 

trunk/lib/string_set.ml

@@ -2 +2 @@
 
 let list_of_csv x = Str.(split (regexp " *, *")) (String.trim x)
-let of_string x = of_list (list_of_csv x)
+let list_of_ssv x = Str.(split (regexp " +")) (String.trim x)
+
+let of_string ?(separator=list_of_csv) x = of_list (separator x)
+let of_csv_string x = of_string ~separator:list_of_csv x
+let of_ssv_string x = of_string ~separator:list_of_ssv x
+
 let to_string ?(pre="") ?(sep=", ") s =
   let j a x = match a, x with "", _ -> x | _, "" -> a | _ -> a ^ sep ^ x in

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 ?(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
         }
 
@@ -40 +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" | "references" | "series" as k -> with_str_set x k 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))
+                        x k v
         | k -> { x with string_map = String_map.add k (trim v) x.string_map }