X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Flds_event.c;h=8587b11acbea0a5218b3e6d6276f57db3a3aa38c;hb=295e0273f2ff3bb95f7afb1ac639ab7203672c9c;hp=fbd021d9e02266549d37633472e67f8a4465d51f;hpb=082066d0c776403b70c366f9a7d1333c7a9fac15;p=gedcom-parse.git

diff --git a/gom/lds_event.c b/gom/lds_event.c
index fbd021d..8587b11 100644
--- a/gom/lds_event.c
+++ b/gom/lds_event.c
@@ -41,12 +41,8 @@ Gedcom_ctxt sub_lds_event_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct lds_event *lds_evt
-      = (struct lds_event*)malloc(sizeof(struct lds_event));
-    if (! lds_evt)
-      MEMORY_ERROR;
-    else {
-      memset (lds_evt, 0, sizeof(struct lds_event));
+    struct lds_event *lds_evt = SUB_MAKEFUNC(lds_event)();
+    if (lds_evt) {
       lds_evt->event = parsed_tag;
       lds_evt->event_name = strdup(tag);
       if (! lds_evt->event_name) {
@@ -56,9 +52,9 @@ Gedcom_ctxt sub_lds_event_start(_ELT_PARAMS_)
       else {
 	switch (ctxt->ctxt_type) {
 	  case REC_FAM:
-	    family_add_lss(ctxt, lds_evt); break;
+	    ADDFUNC2(family,lds_event)(ctxt, lds_evt); break;
 	  case REC_INDI:
-	    individual_add_lio(ctxt, lds_evt); break;
+	    ADDFUNC2(individual,lds_event)(ctxt, lds_evt); break;
 	  default:
 	    UNEXPECTED_CONTEXT(ctxt->ctxt_type);
 	}
@@ -70,11 +66,17 @@ Gedcom_ctxt sub_lds_event_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-STRING_CB(lds_event, sub_lds_event_stat_start, date_status)
-DATE_CB(lds_event, sub_lds_event_date_start, date)
-STRING_CB(lds_event, sub_lds_event_temp_start, temple_code)
-STRING_CB(lds_event, sub_lds_event_plac_start, place_living_ordinance)
-XREF_CB(lds_event, sub_lds_event_famc_start, family, make_family_record)
+DEFINE_SUB_MAKEFUNC(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_temp_start, temple_code)
+DEFINE_STRING_CB(lds_event, sub_lds_event_plac_start, place_living_ordinance)
+DEFINE_XREF_CB(lds_event, sub_lds_event_famc_start, family, family)
+
+DEFINE_ADDFUNC2(lds_event, note_sub, note)
+DEFINE_ADDFUNC2(lds_event, source_citation, citation)
+DEFINE_ADDFUNC2(lds_event, user_data, extra)
      
 void lds_event_subscribe()
 {
@@ -104,28 +106,7 @@ void lds_event_subscribe()
 			      sub_lds_event_famc_start, def_elt_end);
 }
 
-void lds_event_add_note(Gom_ctxt ctxt, struct note_sub* note)
-{
-  struct lds_event *lds = SAFE_CTXT_CAST(lds_event, ctxt);
-  if (lds)
-    LINK_CHAIN_ELT(note_sub, lds->note, note);    
-}
-
-void lds_event_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
-{
-  struct lds_event *lds = SAFE_CTXT_CAST(lds_event, ctxt);
-  if (lds)
-    LINK_CHAIN_ELT(source_citation, lds->citation, cit);    
-}
-
-void lds_event_add_user_data(Gom_ctxt ctxt, struct user_data* data)
-{
-  struct lds_event *obj = SAFE_CTXT_CAST(lds_event, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
-}
-
-void lds_event_cleanup(struct lds_event* lds)
+void CLEANFUNC(lds_event)(struct lds_event* lds)
 {
   if (lds) {
     SAFE_FREE(lds->event_name);
@@ -133,9 +114,9 @@ void lds_event_cleanup(struct lds_event* lds)
     SAFE_FREE(lds->date);
     SAFE_FREE(lds->temple_code);
     SAFE_FREE(lds->place_living_ordinance);
-    DESTROY_CHAIN_ELTS(source_citation, lds->citation, citation_cleanup);  
-    DESTROY_CHAIN_ELTS(note_sub, lds->note, note_sub_cleanup);
-    DESTROY_CHAIN_ELTS(user_data, lds->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(source_citation, lds->citation);  
+    DESTROY_CHAIN_ELTS(note_sub, lds->note);
+    DESTROY_CHAIN_ELTS(user_data, lds->extra);
   }
 }
 
@@ -166,16 +147,19 @@ int write_lds_events(Gedcom_write_hndl hndl, int parent, struct lds_event *lds)
 				       parent, NULL);
     if (obj->date_status)
       result |= gedcom_write_element_str(hndl, ELT_SUB_LIO_BAPL_STAT, 0,
-					 parent, obj->date_status);
+					 obj_elt, obj->date_status);
+    if (obj->date)
+      result |= gedcom_write_element_date(hndl, ELT_SUB_LIO_BAPL_DATE, 0,
+					  obj_elt, obj->date);
     if (obj->temple_code)
       result |= gedcom_write_element_str(hndl, ELT_SUB_LIO_BAPL_TEMP, 0,
-					 parent, obj->temple_code);
+					 obj_elt, obj->temple_code);
     if (obj->place_living_ordinance)
       result |= gedcom_write_element_str(hndl, ELT_SUB_LIO_BAPL_PLAC, 0,
-					 parent, obj->place_living_ordinance);
+					 obj_elt, obj->place_living_ordinance);
     if (obj->family)
       result |= gedcom_write_element_xref(hndl, ELT_SUB_LIO_SLGC_FAMC, 0,
-					  parent, obj->family);
+					  obj_elt, obj->family);
     if (obj->citation)
       result |= write_citations(hndl, obj_elt, obj->citation);
     if (obj->note)