dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only try to delete address if present.
[gedcom-parse.git]
/
gom
/
lds_event.c
diff --git
a/gom/lds_event.c
b/gom/lds_event.c
index 6a7be358df5267a88948c5eeeae7399800b8f73a..799e23d75431b257447e8c96030ceea8530b3f28 100644
(file)
--- a/
gom/lds_event.c
+++ b/
gom/lds_event.c
@@
-67,6
+67,10
@@
Gedcom_ctxt sub_lds_event_start(_ELT_PARAMS_)
}
DEFINE_SUB_MAKEFUNC(lds_event)
}
DEFINE_SUB_MAKEFUNC(lds_event)
+DEFINE_SUB_ADDFUNC(lds_event)
+DEFINE_SUB_FINDFUNC(lds_event)
+DEFINE_SUB_REMOVEFUNC(lds_event)
+DEFINE_SUB_MOVEFUNC(lds_event)
DEFINE_STRING_CB(lds_event, sub_lds_event_stat_start, date_status)
DEFINE_DATE_CB(lds_event, sub_lds_event_date_start, date)
DEFINE_STRING_CB(lds_event, sub_lds_event_stat_start, date_status)
DEFINE_DATE_CB(lds_event, sub_lds_event_date_start, date)
@@
-141,6
+145,8
@@
static int get_gedcom_elt(int parsed_tag)
obj_elt = ELT_SUB_LIO_BAPL; break;
case TAG_SLGC:
obj_elt = ELT_SUB_LIO_SLGC; break;
obj_elt = ELT_SUB_LIO_BAPL; break;
case TAG_SLGC:
obj_elt = ELT_SUB_LIO_SLGC; break;
+ case TAG_SLGS:
+ obj_elt = ELT_SUB_LSS_SLGS; break;
default:
gedcom_warning(_("Internal error: unknown evt tag %d"), parsed_tag);
}
default:
gedcom_warning(_("Internal error: unknown evt tag %d"), parsed_tag);
}
@@
-156,19
+162,28
@@
int write_lds_events(Gedcom_write_hndl hndl, int parent, struct lds_event *lds)
for (obj = lds; obj; obj = obj->next) {
int obj_elt = get_gedcom_elt(obj->event);
for (obj = lds; obj; obj = obj->next) {
int obj_elt = get_gedcom_elt(obj->event);
+ int lss = (obj_elt == ELT_SUB_LSS_SLGS);
result |= gedcom_write_element_str(hndl, obj_elt, obj->event,
parent, NULL);
if (obj->date_status)
result |= gedcom_write_element_str(hndl, obj_elt, obj->event,
parent, NULL);
if (obj->date_status)
- result |= gedcom_write_element_str(hndl, ELT_SUB_LIO_BAPL_STAT, 0,
+ result |= gedcom_write_element_str(hndl,
+ (lss ? ELT_SUB_LSS_SLGS_STAT :
+ ELT_SUB_LIO_BAPL_STAT), 0,
obj_elt, obj->date_status);
if (obj->date)
obj_elt, obj->date_status);
if (obj->date)
- result |= gedcom_write_element_date(hndl, ELT_SUB_LIO_BAPL_DATE, 0,
+ result |= gedcom_write_element_date(hndl,
+ (lss ? ELT_SUB_LSS_SLGS_DATE :
+ ELT_SUB_LIO_BAPL_DATE), 0,
obj_elt, obj->date);
if (obj->temple_code)
obj_elt, obj->date);
if (obj->temple_code)
- result |= gedcom_write_element_str(hndl, ELT_SUB_LIO_BAPL_TEMP, 0,
+ result |= gedcom_write_element_str(hndl,
+ (lss ? ELT_SUB_LSS_SLGS_TEMP :
+ ELT_SUB_LIO_BAPL_TEMP), 0,
obj_elt, obj->temple_code);
if (obj->place_living_ordinance)
obj_elt, obj->temple_code);
if (obj->place_living_ordinance)
- result |= gedcom_write_element_str(hndl, ELT_SUB_LIO_BAPL_PLAC, 0,
+ result |= gedcom_write_element_str(hndl,
+ (lss ? ELT_SUB_LSS_SLGS_PLAC :
+ ELT_SUB_LIO_BAPL_PLAC), 0,
obj_elt, obj->place_living_ordinance);
if (obj->family)
result |= gedcom_write_element_xref(hndl, ELT_SUB_LIO_SLGC_FAMC, 0,
obj_elt, obj->place_living_ordinance);
if (obj->family)
result |= gedcom_write_element_xref(hndl, ELT_SUB_LIO_SLGC_FAMC, 0,