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


Ignore:
Timestamp:
Dec 12, 2022, 10:52:55 PM (2 years ago)
Author:
fox
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/convert.ml

    r21 r39  
    2727        t
    2828
     29let acc_ref id t a =
     30        Conversion.Id_map.update t (function
     31        | Some s -> Some (Conversion.Ref_set.add id s)
     32        | None -> Some (Conversion.Ref_set.singleton id)
     33        ) a
     34
     35let fold_refs text refs = String_set.fold (acc_ref text.Text.id) (Text.set "references" text) refs
     36
    2937let directory converters noindex repo =
    30         let fn (ts,ls,acc) ((elt,_) as r) =
    31                 (Topic_set.to_map ts (Text.set "topics" elt)), elt::ls,
     38        let fn (ts,refs,ls,acc) ((elt,_) as r) =
     39                Topic_set.to_map ts (Text.set "topics" elt),
     40                fold_refs elt refs,
     41                elt::ls,
    3242                if convert converters repo r then acc+1 else acc in
    33         let topics, texts, count =
    34                 File_store.(fold ~dir:repo.Conversion.dir ~order:newest fn (Topic_set.Map.empty,[],0)) in
     43        let topics, references, texts, count =
     44                File_store.(fold ~dir:repo.Conversion.dir ~order:newest fn (Topic_set.Map.empty, Conversion.Id_map.empty, [], 0)) in
    3545        let topic_roots = try List.rev @@ String_set.list_of_csv (Store.KV.find "Topics" repo.kv)
    3646                with Not_found -> Topic_set.roots topics in
    37         let repo = Conversion.{ repo with topic_roots; topics; texts } in
     47        let repo = Conversion.{ repo with topic_roots; topics; references; texts } in
    3848        if not noindex then List.iter (fun c -> match c.Conversion.indices with None -> () | Some f -> f repo) converters;
    3949        Printf.printf "Converted: %d Indexed: %d\n" count (List.length texts)
     
    6373                        | Error s -> prerr_endline s
    6474                        | Ok text ->
    65                                 let repo = { (Conversion.empty ()) with dir = ""; kv = load_kv "" } in
     75                                let dir = "." in
     76                                let references = File_store.(fold ~dir ~order:newest
     77                                        (fun refs (elt, _) -> fold_refs elt refs) Conversion.Id_map.empty) in
     78                                        Conversion.Id_map.iter
     79                                                (fun k v -> Conversion.Ref_set.iter (fun e -> Printf.eprintf "%s %s\n" k e) v)
     80                                                references;
     81                                let repo = { (Conversion.empty ()) with dir; kv = load_kv ""; references } in
    6682                                ignore @@ convert (converters types repo.kv) repo (text, [path])
    6783                )
Note: See TracChangeset for help on using the changeset viewer.