Changeset 43 in code for trunk/lib/header_pack.ml

Timestamp:

Dec 18, 2022, 2:49:25 PM (2 years ago)

Author:

fox

Message:

Relation dates, with conversion condition upon it

File:

• trunk/lib/header_pack.ml (modified) (3 diffs)

trunk/lib/header_pack.ml

@@ -85 +85 @@
         | Msgpck.List (id::_time::title::_authors::_topics::[]) ->
                 (match to_id id with
-                 | "" -> prerr_endline ("Invalid id for " ^ Msgpck.to_string title); false
+                 | "" -> Printf.eprintf "Invalid id for %s" (Msgpck.to_string title); false
                  | id -> text.Text.id = id)
         | _ -> prerr_endline ("Invalid record pattern"); false
@@ -106 +106 @@
                 in
                 fn i id t title authors topics references replies
-        | _  -> prerr_endline ("\n\nInvalid record structure\n\n")
+        | x -> Printf.eprintf "Invalid record structure: %s\n%!" (Msgpck.show x)
 
-let txt_fold_apply fn i m =
-(*      Printf.eprintf "%s\n%!" @@ Msgpck.show m;*)
-        match m with
+let txt_fold_apply fn i = function
         | Msgpck.List (id::time::title::authors::topics::extra) ->
                 let t = match time with Msgpck.Int i -> Int32.of_int i | Msgpck.Uint32 i -> i
@@ -116 +114 @@
                 let id = to_id id in
                 let title = Msgpck.to_string title in
-                let topics = try to_str_list topics with _e -> Printf.eprintf "topics %s" title; [] in
-                let authors = try to_str_list authors with _e -> Printf.eprintf "authors %s" title; [] in
+                let topics = to_str_list topics in
+                let authors = to_str_list authors in
                 let references, replies = begin match extra with
                         | [] -> [], []
-                        | refs::[] -> (try to_str_list refs, [] with e -> prerr_endline "fold ref"; raise e)
+                        | refs::[] -> to_str_list refs, []
                         | refs::replies::_xs -> to_str_list refs, to_str_list replies
                         end
                 in
                 fn i id t title authors topics references replies
-        | x  -> Printf.eprintf "Invalid record structure: %s\n%!" (Msgpck.show x); i
+        | x -> Printf.eprintf "Invalid record structure: %s\n%!" (Msgpck.show x); i
 
-let iteri fn pack = List.iteri (txt_iter_apply fn) (Msgpck.to_list pack.texts)
-let fold fn init pack = List.fold_left (txt_fold_apply fn) init
-        (try Msgpck.to_list pack.texts with e -> prerr_string "Pack.fold"; raise e)
+let iteri fn pack = List.iteri
+        (txt_iter_apply fn)
+        (Msgpck.to_list pack.texts)
+
+let fold fn init pack = List.fold_left
+        (fun acc m -> try txt_fold_apply fn acc m with Invalid_argument x -> prerr_endline x; acc) init
+        (try Msgpck.to_list pack.texts with e -> prerr_string "Invalid pack.texts"; raise e)