Changeset 5 in code for trunk

Timestamp:

Jun 13, 2022, 4:34:20 PM (3 years ago)

Author:

fox

Message:

Change output date format & use <ul> for latest

Location:

trunk

Files:

• cli/html.ml (modified) (2 diffs)
• lib/date.ml (modified) (1 diff)

trunk/cli/html.ml

@@ -84 +84 @@
   in
   List.fold_left
-    (fun a m ->
-      a ^ Logarion.(Date.(pretty_date (listing m.Text.date)) ^ " ")
-      ^ {|<a href="|} ^ Logarion.Text.short_id m ^ {|.htm">|} ^ m.Logarion.Text.title ^ "</a><br>")
+    (fun a m -> Printf.sprintf "%s<li> %s <a href=\"%s.htm\">%s</a>" a
+      Logarion.(Date.(pretty_date (listing m.Text.date)))
+      (Logarion.Text.short_id m) m.Logarion.Text.title)
     "" meta_list
 
@@ -147 +147 @@
   wrap conv htm "Topics"
     (fold_topic_roots topic_roots
-     ^ "<nav><h1>Latest</h1>" ^ to_dated_links ~limit:10 metas
-     ^ {|<a href="index.date.htm">More by date</a></nav>|} )
+     ^ "<nav><h1>Latest</h1><ul>" ^ to_dated_links ~limit:8 metas
+     ^ {|</ul><a href="index.date.htm">More by date</a></nav>|} )
 
 let topic_sub_index conv htm topic_map topic_root metas =

trunk/lib/date.ml

@@ -4 +4 @@
 let of_string (rfc : string) = rfc
 let listing date = if date.edited <> "" then date.edited else date.created
+let months = [|"Jan";"Feb";"Mar";"Apr";"May";"Jun";"Jul";"Aug";"Sep";"Oct";"Nov";"Dec"|]
 let pretty_date date =
-        try Scanf.sscanf date "%4s-%2s-%2s" (fun y m d -> Printf.sprintf "%s %s %s" y m d)
-        with Scanf.Scan_failure s as e -> Printf.fprintf stderr "%s for %s\n" s date; raise e
+        try Scanf.sscanf date "%4s-%d-%2s" (fun y m d -> Printf.sprintf "%s %s, %s" d (months.(m-1)) y)
+        with
+        | Scanf.Scan_failure s as e -> Printf.fprintf stderr "%s for %s\n" s date; raise e
+        | Invalid_argument _s as e -> Printf.fprintf stderr "Parsing %s" date; raise e
 let now () = Unix.time () |> Unix.gmtime |>
         (fun t -> Printf.sprintf "%4d-%02d-%02dT%02d:%02d:%02dZ"