X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Flds_event.c;h=8587b11acbea0a5218b3e6d6276f57db3a3aa38c;hb=763e8737b5118c5f23dca84a3290c2d805bbefe6;hp=5abaa2ec7af4cfd70e4ac68aac573827ba522231;hpb=bdf47fdee469d5a1d7ddfd06a0e4b26f3b40b0f4;p=gedcom-parse.git

diff --git a/gom/lds_event.c b/gom/lds_event.c
index 5abaa2e..8587b11 100644
--- a/gom/lds_event.c
+++ b/gom/lds_event.c
@@ -41,33 +41,42 @@ 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));
-      
-      switch (ctxt->ctxt_type) {
-	case REC_FAM:
-	  family_add_lss(ctxt, lds_evt); break;
-	case REC_INDI:
-	  individual_add_lio(ctxt, lds_evt); break;
-	default:
-	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+    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) {
+	MEMORY_ERROR;
+	free(lds_evt);
+      }
+      else {
+	switch (ctxt->ctxt_type) {
+	  case REC_FAM:
+	    ADDFUNC2(family,lds_event)(ctxt, lds_evt); break;
+	  case REC_INDI:
+	    ADDFUNC2(individual,lds_event)(ctxt, lds_evt); break;
+	  default:
+	    UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+	}
+	result = MAKE_GOM_CTXT(elt, lds_event, lds_evt);
       }
-      result = MAKE_GOM_CTXT(elt, lds_event, lds_evt);
     }
   }
 
   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()
 {
@@ -97,36 +106,67 @@ void lds_event_subscribe()
 			      sub_lds_event_famc_start, def_elt_end);
 }
 
-void lds_event_add_note(Gom_ctxt ctxt, struct note_sub* note)
+void CLEANFUNC(lds_event)(struct lds_event* lds)
 {
-  struct lds_event *lds = SAFE_CTXT_CAST(lds_event, ctxt);
-  if (lds)
-    LINK_CHAIN_ELT(note_sub, lds->note, note);    
+  if (lds) {
+    SAFE_FREE(lds->event_name);
+    SAFE_FREE(lds->date_status);
+    SAFE_FREE(lds->date);
+    SAFE_FREE(lds->temple_code);
+    SAFE_FREE(lds->place_living_ordinance);
+    DESTROY_CHAIN_ELTS(source_citation, lds->citation);  
+    DESTROY_CHAIN_ELTS(note_sub, lds->note);
+    DESTROY_CHAIN_ELTS(user_data, lds->extra);
+  }
 }
 
-void lds_event_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
+static int get_gedcom_elt(int parsed_tag)
 {
-  struct lds_event *lds = SAFE_CTXT_CAST(lds_event, ctxt);
-  if (lds)
-    LINK_CHAIN_ELT(source_citation, lds->citation, cit);    
+  int obj_elt = 0;
+  switch (parsed_tag) {
+    case TAG_BAPL: case TAG_CONL: case TAG_ENDL:
+      obj_elt = ELT_SUB_LIO_BAPL; break;
+    case TAG_SLGC:
+      obj_elt = ELT_SUB_LIO_SLGC; break;
+    default:
+      gedcom_warning(_("Internal error: unknown evt tag %d"), parsed_tag);
+  }
+  return obj_elt;
 }
-
-void lds_event_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+  
+int write_lds_events(Gedcom_write_hndl hndl, int parent, struct lds_event *lds)
 {
-  struct lds_event *obj = SAFE_CTXT_CAST(lds_event, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
-}
+  int result = 0;
+  struct lds_event* obj;
 
-void lds_event_cleanup(struct lds_event* lds)
-{
-  if (lds) {
-    SAFE_FREE(lds->date_status);
-    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);
+  if (!lds) return 1;
+
+  for (obj = lds; obj; obj = obj->next) {
+    int obj_elt = get_gedcom_elt(obj->event);
+    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,
+					 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,
+					 obj_elt, obj->temple_code);
+    if (obj->place_living_ordinance)
+      result |= gedcom_write_element_str(hndl, 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->family);
+    if (obj->citation)
+      result |= write_citations(hndl, obj_elt, obj->citation);
+    if (obj->note)
+      result |= write_note_subs(hndl, obj_elt, obj->note);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);
   }
+
+  return result;
 }