change visible_for_visitors

.merlin

@@ -0,0 +1 @@
+PKG geneweb

src/api.ml

@@ -283,14 +283,14 @@ let print_last_modified_persons conf base =
     | Some range ->
         let date_begin = range.M.Filter_date_range.date_begin in
         let dmy1 =
-          { day = Int32.to_int date_begin.M.Filter_date.day;
+          Date.{ day = Int32.to_int date_begin.M.Filter_date.day;
             month = Int32.to_int date_begin.M.Filter_date.month;
             year = Int32.to_int date_begin.M.Filter_date.year;
             prec = Sure; delta = 0 }
         in
         let date_end = range.M.Filter_date_range.date_end in
         let dmy2 =
-          { day = Int32.to_int date_end.M.Filter_date.day;
+          Date.{ day = Int32.to_int date_end.M.Filter_date.day;
             month = Int32.to_int date_end.M.Filter_date.month;
             year = Int32.to_int date_end.M.Filter_date.year;
             prec = Sure; delta = 0 }
@@ -308,9 +308,9 @@ let print_last_modified_persons conf base =
           let m = int_of_string (String.sub time 5 2) in
           let d = int_of_string (String.sub time 8 2) in
           let dmy =
-            { day = d; month = m; year = y; prec = Sure; delta = 0; }
+            Date.{ day = d; month = m; year = y; prec = Sure; delta = 0; }
           in
-          Some (Dgreg (dmy, Dgregorian))
+          Some (Date.Dgreg (dmy, Dgregorian))
         in
         is_date_included prec date date_begin date_end
     | None -> true
@@ -324,11 +324,11 @@ let print_last_modified_persons conf base =
         let m = int_of_string (String.sub time 5 2) in
         let d = int_of_string (String.sub time 8 2) in
         let dmy =
-          { day = d; month = m; year = y; prec = Sure; delta = 0; }
+          Date.{ day = d; month = m; year = y; prec = Sure; delta = 0; }
         in
-        Some (Dgreg (dmy, Dgregorian))
+        Some (Date.Dgreg (dmy, Dgregorian))
       in
-      let dmy_zero = { day = 1; month = 1; year = 1970; prec = Sure; delta = 0; } in
+      let dmy_zero = Date.{ day = 1; month = 1; year = 1970; prec = Sure; delta = 0; } in
       is_date_included prec date dmy_zero date_begin
     | None -> true
   in
@@ -649,7 +649,7 @@ let print_base_warnings conf base =
       in
       let result =
         (* Make the warning list uniq *)
-        Hashtbl.fold begin fun x _ acc ->
+        Hashtbl.fold begin fun (x : CheckItem.base_warning) _ acc ->
           Api_warnings.add_warning_to_piqi_warning_list conf base acc x
         end warnings result
       in

src/api_def.ml

@@ -10,8 +10,8 @@ type filters =
     only_recent : bool;
     filter_sex : Def.sex option;
     nb_results : bool;
-    date_birth : (dmy * dmy * bool) option;
-    date_death : (dmy * dmy * bool) option;
+    date_birth : (Date.dmy * Date.dmy * bool) option;
+    date_death : (Date.dmy * Date.dmy * bool) option;
   }
 ;;
 

src/api_graph.ml

@@ -69,12 +69,12 @@ let pevents_aux conf base filter acc p =
           begin
             { M.Event_query_result.p = pers_to_piqi_person p
             ; sp = None
-            ; pevent_name = Some (Api_piqi_util.piqi_pevent_name_of_pevent_name e.epers_name)
+            ; pevent_name = Some (Api_piqi_util.piqi_pevent_name_of_pevent_name (get_pevent_name e))
             ; fevent_name = None
-            ; date = piqi_date_of_date @@ Date.date_of_cdate e.epers_date
-            ; place = sou base e.epers_place
-            ; note = sou base e.epers_note
-            ; src = sou base e.epers_src
+            ; date = piqi_date_of_date @@ Date.date_of_cdate (get_pevent_date e)
+            ; place = sou base (get_pevent_place e)
+            ; note = sou base (get_pevent_note e)
+            ; src = sou base (get_pevent_src e)
             } :: acc
         end
       else acc
@@ -92,11 +92,11 @@ let fevents_aux conf base filter acc f =
           { M.Event_query_result.p = pers_to_piqi_person @@ poi base @@ Gwdb.get_father f
           ; sp = Some (pers_to_piqi_person @@ poi base @@ Gwdb.get_mother f)
           ; pevent_name = None
-          ; fevent_name = Some (Api_piqi_util.piqi_fevent_name_of_fevent_name e.efam_name)
-          ; date = piqi_date_of_date @@ Date.date_of_cdate e.efam_date
-          ; place = sou base e.efam_place
-          ; note = sou base e.efam_note
-          ; src = sou base e.efam_src
+          ; fevent_name = Some (Api_piqi_util.piqi_fevent_name_of_fevent_name (get_fevent_name e))
+          ; date = piqi_date_of_date @@ Date.date_of_cdate (get_fevent_date e)
+          ; place = sou base (get_fevent_place e)
+          ; note = sou base (get_fevent_note e)
+          ; src = sou base (get_fevent_src e)
           } :: acc
         else acc
       end acc events
@@ -110,8 +110,9 @@ let events_filters_aux params =
       let b = date_of_piqi_date b in
       fun d ->
         begin
-          try Date.compare_date ~strict:true d b >= 0
-          with Date.Not_comparable -> false
+          match Date.compare_date_strict d b with
+          | None -> false
+          | Some v -> v >= 0
         end
     | None -> fun _ -> true
   in
@@ -121,19 +122,20 @@ let events_filters_aux params =
       let b = date_of_piqi_date b in
       fun d ->
         begin
-          try Date.compare_date ~strict:true d b <= 0
-          with Date.Not_comparable -> false
+          match Date.compare_date_strict d b with
+          | None -> false
+          | Some v -> v <= 0
         end
     | None -> fun _ -> true
   in
   ( (fun e ->
-        List.mem e.epers_name filter_pevents
-        && match Date.od_of_cdate e.epers_date with
+        List.mem (get_pevent_name e) filter_pevents
+        && match Date.od_of_cdate (get_pevent_date e) with
         | Some d -> filter_start_date d && filter_stop_date d
         | None -> false)
   , (fun e ->
-       List.mem e.efam_name filter_fevents
-       && match Date.od_of_cdate e.efam_date with
+       List.mem (get_fevent_name e) filter_fevents
+       && match Date.od_of_cdate (get_fevent_date e) with
         | Some d -> filter_start_date d && filter_stop_date d
         | None -> false)
   )

src/api_piqi_util.ml

@@ -1,5 +1,6 @@
 open Geneweb
 open Def
+open Date
 open Config
 
 let p_getenvbin env label =

src/api_saisie_autocomplete.ml

@@ -1,6 +1,5 @@
 open Geneweb
 open Config
-open Def
 open Gwdb
 open Util
 
@@ -27,25 +26,25 @@ let create_cache base mode cache_file =
         Gwdb.Collection.fold
           (fun acc p ->
              List.fold_left
-               (fun acc e -> add acc e.epers_place) acc (get_pevents p) )
+               (fun acc e -> add acc (get_pevent_place e)) acc (get_pevents p) )
           IstrSet.empty (Gwdb.persons base)
       in
       Gwdb.Collection.fold
-        (fun acc f -> List.fold_left (fun acc e -> add acc e.efam_place) acc (get_fevents f) )
+        (fun acc f -> List.fold_left (fun acc e -> add acc (get_fevent_place e)) acc (get_fevents f) )
         acc (Gwdb.families base)
     | `source ->
       let acc =
         Gwdb.Collection.fold
           (fun acc p ->
              let acc = add acc (get_psources p) in
-             List.fold_left (fun acc e -> add acc e.epers_src) acc (get_pevents p) )
+             List.fold_left (fun acc e -> add acc (get_pevent_src e)) acc (get_pevents p) )
           IstrSet.empty
           (Gwdb.persons base)
       in
       Gwdb.Collection.fold
         (fun acc f ->
            let acc = add acc (get_fsources f) in
-           List.fold_left (fun acc e -> add acc e.efam_src) acc (get_fevents f) )
+           List.fold_left (fun acc e -> add acc (get_fevent_src e)) acc (get_fevents f) )
         acc
         (Gwdb.families base)
   in