Permalink
Browse files

TO BE REMOVED: removed officer witness type.

  • Loading branch information...
sagotch committed Oct 29, 2018
1 parent fdf1d07 commit c2571a308debc44ffe560720a2efe256c684250d
@@ -1578,7 +1578,6 @@ let find_event_witness gen tag ip r =
match find_field "RELA" r.rsons with
Some rr ->
if rr.rval = "GODP" then Witness_GodParent
else if rr.rval = "officer" then Witness_Officer
else Witness
| _ -> Witness
in
@@ -1589,7 +1588,6 @@ let find_event_witness gen tag ip r =
match find_field "RELA" r.rsons with
Some rr ->
if rr.rval = "GODP" then Witness_GodParent
else if rr.rval = "officer" then Witness_Officer
else Witness
| _ -> Witness
in
@@ -1613,7 +1611,6 @@ let find_fevent_witness gen tag ifath r =
match find_field "RELA" r.rsons with
Some rr ->
if rr.rval = "GODP" then Witness_GodParent
else if rr.rval = "officer" then Witness_Officer
else Witness
| _ -> Witness
in
@@ -1624,7 +1621,6 @@ let find_fevent_witness gen tag ifath r =
match find_field "RELA" r.rsons with
Some rr ->
if rr.rval = "GODP" then Witness_GodParent
else if rr.rval = "officer" then Witness_Officer
else Witness
| _ -> Witness
in
@@ -1355,8 +1355,7 @@ let find_fevent_witness gen tag ifath r =
match find_field "RELA" r.rsons with
Some rr ->
if rr.rval = "GODP" then Witness_GodParent
else if rr.rval = "officer" then Witness_Officer
else Witness
else Witness
| _ -> Witness
in
(witness, witness_kind) :: find_witnesses asso_l
@@ -1366,7 +1365,6 @@ let find_fevent_witness gen tag ifath r =
match find_field "RELA" r.rsons with
Some rr ->
if rr.rval = "GODP" then Witness_GodParent
else if rr.rval = "officer" then Witness_Officer
else Witness
| _ -> Witness
in
@@ -378,7 +378,6 @@ let ged_pevent base oc per_sel evt =
match wk with
Witness -> Printf.fprintf oc "3 RELA witness\n"
| Witness_GodParent -> Printf.fprintf oc "3 RELA GODP\n"
| Witness_Officer -> Printf.fprintf oc "3 RELA officer\n"
end)
evt.epers_witnesses
@@ -611,7 +610,6 @@ let ged_fevent base oc ifam fam_sel evt =
match wk with
Witness -> Printf.fprintf oc "3 RELA witness\n"
| Witness_GodParent -> Printf.fprintf oc "3 RELA GODP\n"
| Witness_Officer -> Printf.fprintf oc "3 RELA officer\n"
end)
evt.efam_witnesses
@@ -70,7 +70,7 @@ type 'string gen_title =
t_date_end : cdate;
t_nth : int }
type witness_kind = Witness | Witness_GodParent | Witness_Officer
type witness_kind = Witness | Witness_GodParent
type 'string gen_pers_event_name =
Epers_Birth
@@ -587,7 +587,6 @@ let get_optional_event_date l =
let get_event_witness_kind l =
match l with
"#godp" :: l' -> Witness_GodParent, l'
| "#offi" :: l' -> Witness_Officer, l'
| _ -> Witness, l
let get_mar_date str =
@@ -635,7 +635,6 @@ module Make (Select : Select) =
Printf.fprintf oc ": ";
begin match wk with
Witness_GodParent -> Printf.fprintf oc "#godp "
| Witness_Officer -> Printf.fprintf oc "#offi "
| _ -> ()
end;
print_witness oc base gen p;
@@ -735,7 +734,6 @@ module Make (Select : Select) =
Printf.fprintf oc ": ";
begin match wk with
Witness_GodParent -> Printf.fprintf oc "#godp "
| Witness_Officer -> Printf.fprintf oc "#offi "
| _ -> ()
end;
print_witness oc base gen p;
@@ -966,7 +964,6 @@ module Make (Select : Select) =
Printf.fprintf oc ": ";
begin match wk with
Witness_GodParent -> Printf.fprintf oc "#godp "
| Witness_Officer -> Printf.fprintf oc "#offi "
| _ -> ()
end;
print_witness oc base gen p;
@@ -1142,7 +1142,6 @@ let string_of_fevent_name conf base efam_name =
let string_of_witness_kind conf p witness_kind =
match witness_kind with
Witness -> transl_nth conf "witness/witness/witnesses" 0
| Witness_Officer -> transl_nth conf "officer/officer/officers" 0
| Witness_GodParent ->
let n = index_of_sex (get_sex p) in
transl_nth conf "godfather/godmother/godparents" n
@@ -169,7 +169,6 @@ enum EventName {
enum WitnessType {
WITNESS = 0;
WITNESS_GODPARENT = 1;
WITNESS_OFFICER = 2;
}
message WitnessEvent {
@@ -856,7 +856,6 @@ let fill_events conf base p base_prefix p_auth pers_to_piqi_callback witness_con
match wk with
| Witness -> `witness
| Witness_GodParent -> `witness_godparent
| Witness_Officer -> `witness_officer
in
let witness = poi base ip in
let witness = pers_to_piqi_callback conf base witness base_prefix in
@@ -92,7 +92,6 @@ enum RelationType {
enum WitnessType {
WITNESS = 0;
WITNESS_GODPARENT = 1;
WITNESS_OFFICER = 2;
}
enum EventType {
@@ -23,7 +23,6 @@ enum Calendar {
enum WitnessType {
WITNESS = 0;
WITNESS_GODPARENT = 1;
WITNESS_OFFICER = 2;
}
enum Precision {
@@ -91,7 +91,6 @@ let reconstitute_family conf base mod_f =
match witness.Mwrite.Witness.witness_type with
| `witness -> Witness
| `witness_godparent -> Witness_GodParent
| `witness_officer -> Witness_Officer
in
let wit = (reconstitute_somebody base person, wk) in
wit :: accu
@@ -254,7 +254,6 @@ let reconstitute_person conf base mod_p =
match witness.Mwrite.Witness.witness_type with
| `witness -> Witness
| `witness_godparent -> Witness_GodParent
| `witness_officer -> Witness_Officer
in
let wit = (reconstitute_somebody base person, wk) in
wit :: accu
@@ -887,7 +887,6 @@ let pers_to_piqi_person_search_info conf base p =
match wk with
| Witness -> `witness
| Witness_GodParent -> `witness_godparent
| Witness_Officer -> `witness_officer
in
let witness = poi base ip in
let witness =
@@ -1338,7 +1337,6 @@ let pers_to_piqi_mod_person conf base p =
match wk with
| Witness -> `witness
| Witness_GodParent -> `witness_godparent
| Witness_Officer -> `witness_officer
in
let p = poi base ip in
let person_link = pers_to_piqi_person_link conf base p in
@@ -1587,7 +1585,6 @@ let fam_to_piqi_mod_family conf base ifam fam =
match wk with
| Witness -> `witness
| Witness_GodParent -> `witness_godparent
| Witness_Officer -> `witness_officer
in
let p = poi base ip in
let person_link = pers_to_piqi_person_link conf base p in
@@ -1852,7 +1852,6 @@ let pers_to_piqi_app_person conf base p =
match wk with
| Witness -> `witness
| Witness_GodParent -> `witness_godparent
| Witness_Officer -> `witness_officer
in
let index = Int32.of_int (Adef.int_of_iper ip) in
Mapp.Witness_event.({
@@ -278,7 +278,6 @@ and eval_simple_var conf base env (fam, cpl, des) =
if i >= 0 && i < Array.length e.efam_witnesses then
match snd e.efam_witnesses.(i) with
Witness_GodParent -> str_val "godp"
| Witness_Officer -> str_val "offi"
| _ -> str_val ""
else if
i >= 0 && i < 2 && Array.length e.efam_witnesses < 2
@@ -245,7 +245,6 @@ let rec reconstitute_events conf ext cnt =
"_kind")
with
Some "godp" -> c, Witness_GodParent
| Some "offi" -> c, Witness_Officer
| _ -> c, Witness
in
begin match
@@ -371,7 +371,6 @@ and eval_simple_var conf base env p =
if i >= 0 && i < Array.length e.epers_witnesses then
match snd e.epers_witnesses.(i) with
Witness_GodParent -> str_val "godp"
| Witness_Officer -> str_val "offi"
| _ -> str_val ""
else if
i >= 0 && i < 2 && Array.length e.epers_witnesses < 2
@@ -251,7 +251,6 @@ let rec reconstitute_pevents conf ext cnt =
let c =
match p_getenv conf.env var_c with
Some "godp" -> c, Witness_GodParent
| Some "offi" -> c, Witness_Officer
| _ -> c, Witness
in
let var_w =

0 comments on commit c2571a3

Please sign in to comment.