Changeset 41 in code for trunk

Timestamp:

Dec 13, 2022, 11:04:19 PM (2 years ago)

Author:

fox

Message:

In-Reply-To header field. Note extra list.rev in convert

Location:

trunk

Files:

• cli/conversion.ml (modified) (2 diffs)
• cli/convert.ml (modified) (2 diffs)
• cli/html.ml (modified) (4 diffs)
• lib/text.ml (modified) (3 diffs)
• readme.txt (modified) (1 diff)

trunk/cli/conversion.ml

@@ -11 +11 @@
         topics: (String_set.t * String_set.t) Topic_set.Map.t;
         references: Ref_set.t Id_map.t;
+        replies: Ref_set.t Id_map.t;
         texts: Text.t list
 }
@@ -26 +27 @@
         topics = Topic_set.Map.empty;
         references = Id_map.empty;
+        replies = Id_map.empty;
         texts = []
 }

trunk/cli/convert.ml

@@ -34 +34 @@
 
 let fold_refs text refs = String_set.fold (acc_ref text.Text.id) (Text.set "references" text) refs
+let fold_reps text reps = String_set.fold (acc_ref text.Text.id) (Text.set "in-reply-to" text) reps
 
 let directory converters noindex repo =
-        let fn (ts,refs,ls,acc) ((elt,_) as r) =
+        let fn (ts,refs,reps,ls,acc) ((elt,_) as r) =
                 Topic_set.to_map ts (Text.set "topics" elt),
-                fold_refs elt refs,
+                fold_refs elt refs, fold_reps elt reps,
                 elt::ls,
-                if convert converters repo r then acc+1 else acc in
-        let topics, references, texts, count =
-                File_store.(fold ~dir:repo.Conversion.dir ~order:newest fn (Topic_set.Map.empty, Conversion.Id_map.empty, [], 0)) in
+                if convert converters {repo with references = refs; replies = reps} r then acc+1 else acc in
+        let topics, references, replies, texts, count =
+                File_store.(fold ~dir:repo.Conversion.dir ~order:oldest fn
+                        (Topic_set.Map.empty, Conversion.Id_map.empty, Conversion.Id_map.empty, [], 0)) in
         let topic_roots = try List.rev @@ String_set.list_of_csv (Store.KV.find "Topics" repo.kv)
                 with Not_found -> Topic_set.roots topics in
-        let repo = Conversion.{ repo with topic_roots; topics; references; texts } in
-        if not noindex then List.iter (fun c -> match c.Conversion.indices with None -> () | Some f -> f repo) converters;
+        Printf.eprintf "%d\n" (Conversion.Id_map.cardinal replies);
+        let repo = Conversion.{ repo with
+                topic_roots; topics; references; replies; texts = List.rev texts } in
+        if not noindex then
+                List.iter (fun c -> match c.Conversion.indices with None -> () | Some f -> f repo) converters;
         Printf.printf "Converted: %d Indexed: %d\n" count (List.length texts)
 
@@ -74 +79 @@
                         | Ok text ->
                                 let dir = "." in
-                                let references = File_store.(fold ~dir ~order:newest
-                                        (fun refs (elt, _) -> fold_refs elt refs) Conversion.Id_map.empty) in
-                                        Conversion.Id_map.iter
-                                                (fun k v -> Conversion.Ref_set.iter (fun e -> Printf.eprintf "%s %s\n" k e) v)
-                                                references;
-                                let repo = { (Conversion.empty ()) with dir; kv = load_kv ""; references } in
+                                let references, replies = File_store.(fold ~dir ~order:newest
+                                        (fun (refs, reps) (elt, _) -> fold_refs elt refs, fold_reps elt reps)
+                                        (Conversion.Id_map.empty, Conversion.Id_map.empty)) in
+                                let repo = { (Conversion.empty ()) with dir; kv = load_kv ""; references; replies } in
                                 ignore @@ convert (converters types repo.kv) repo (text, [path])
                 )

trunk/cli/html.ml

@@ -40 +40 @@
         header body footer
 
-let topic_link root topic = 
+let topic_link root topic =
         let replaced_space = String.map (function ' '->'+' | x->x) in
         "<a href='index." ^ root ^ ".htm#" ^ replaced_space topic ^ "'>"
@@ -47 +47 @@
 module HtmlConverter = struct
         include Converter.Html
-        let uid_uri u a = Printf.sprintf "%s<a href='%s%s'>%s</a>" a u ext u
+        let uid_uri u a = Printf.sprintf "%s<a href='%s%s'>&lt;%s&gt;</a>" a u ext u
         let angled_uri u a =
                 if try String.sub u 0 10 = "urn:txtid:" with Invalid_argument _ -> false
@@ -74 +74 @@
                         String_set.fold (fun r a -> sep_append a (link r)) x ""
                 in
+                Printf.eprintf "%s %d\n" text.id (Conversion.Id_map.cardinal conversion.Conversion.replies);
                 "<article><header><dl>"
                 ^ opt_kv "Title:" text.title
@@ -82 +83 @@
                 ^ opt_kv "Id:" text.id
                 ^ opt_kv "Refers:" (ref_links (set "references" text))
+                ^ opt_kv "In reply to:" (ref_links (set "in-reply-to" text))
                 ^ opt_kv "Referred by:" (try
                                 ref_links (Conversion.Id_map.find text.id conversion.Conversion.references)
                                 with Not_found -> "")
+                ^ opt_kv "Replies:" (try
+                                ref_links (Conversion.Id_map.find text.id conversion.Conversion.replies)
+                                with Not_found -> "empty replies")
                 ^ {|</dl></header><pre style="white-space:pre-wrap">|} in
         wrap conversion htm text.title ((T.of_string text.body header) ^ "</pre></article>")

trunk/lib/text.ml

@@ -23 +23 @@
 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
         }
 
@@ -38 +46 @@
         | "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 }
@@ -70 +78 @@
         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);

trunk/readme.txt

@@ -1 +1 @@
 ID: ka4wtj
 Title: Logarion
-References: <3sqd84> <hvhhwf> <h1a9tg>
 
 ## Guides