Changeset 41 in code for trunk/cli/convert.ml

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

File:

• trunk/cli/convert.ml (modified) (2 diffs)

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])
                 )