···

       
45
       
45
       
 
       
let query_without_recurrence ~fs calendar_dir ?filter

     

       
46
       
46
       
 
       
    ?(comparator = Event.by_start) ?limit () =

     

       
47
       
47
       
 
       
  let* events = Calendar_dir.get_events ~fs calendar_dir in

     

       
48
       
48
       
-
       
  let filtered_events =

     

       
48
       
48
       
+
       
  let events =

     

       
49
       
49
       
 
       
    match filter with Some f -> List.filter f events | None -> events

     

       
50
       
50
       
 
       
  in

     

       
51
       
51
       
-
       
  let sorted_events = List.sort comparator filtered_events in

     

       
52
       
52
       
-
       
  Ok

     

       
53
       
53
       
-
       
    (match limit with

     

       
54
       
54
       
-
       
    | Some n when n > 0 -> take n sorted_events

     

       
55
       
55
       
-
       
    | _ -> sorted_events)

     

       
51
       
51
       
+
       
  let events = List.sort comparator events in

     

       
52
       
52
       
+
       
  Ok (match limit with Some n when n > 0 -> take n events | _ -> events)

     

       
56
       
53
       
 
       


     

       
57
       
54
       
 
       
let query ~fs calendar_dir ?filter ~from ~to_ ?(comparator = Event.by_start)

     

       
58
       
55
       
 
       
    ?limit () =

     
···

       
65
       
62
       
 
       
      (fun event -> Event.expand_recurrences event ~from ~to_)

     

       
66
       
63
       
 
       
      events

     

       
67
       
64
       
 
       
  in

     

       
68
       
68
       
-
       
  let sorted_events = List.sort comparator events in

     

       
69
       
69
       
-
       
  Ok

     

       
70
       
70
       
-
       
    (match limit with Some n when n > 0 -> take n events | _ -> sorted_events)

     

       
65
       
65
       
+
       
  let events = List.sort comparator events in

     

       
66
       
66
       
+
       
  Ok (match limit with Some n when n > 0 -> take n events | _ -> events)