···

       
425
       
425
       
 
       
        | Some loc when loc <> "" -> " @" ^ loc

     

       
426
       
426
       
 
       
        | _ -> ""

     

       
427
       
427
       
 
       
      in

     

       
428
       
428
       
-
       
      Printf.sprintf "%-45s%s%s%s%s%s%s" id start_date start_time end_date

     

       
429
       
429
       
-
       
        end_time summary location

     

       
428
       
428
       
+
       
      let collection = match get_collection event with Col s -> s in

     

       
429
       
429
       
+
       
      Printf.sprintf "%-45s\t%s\t%s%s%s%s%s%s" id collection start_date

     

       
430
       
430
       
+
       
        start_time end_date end_time summary location

     

       
430
       
431
       
 
       
  | `Entries ->

     

       
431
       
432
       
 
       
      let format_opt label f opt =

     

       
432
       
433
       
 
       
        Option.map (fun x -> Printf.sprintf "%s: %s\n" label (f x)) opt