X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Flds_event.c;h=ac8db42f9eafa09f89b3a7be92d6a5379a00b68d;hb=1568cb8ab16ecc1984d0d00b8ae8189c32508b08;hp=578c0c8519406245cc3015ce6da7fbceab6ca374;hpb=7ea4ef8cae7b52f2bf66371a5e7b493cbd12900e;p=gedcom-parse.git

diff --git a/gom/lds_event.c b/gom/lds_event.c
index 578c0c8..ac8db42 100644
--- a/gom/lds_event.c
+++ b/gom/lds_event.c
@@ -36,23 +36,38 @@
 Gedcom_ctxt sub_lds_event_start(_ELT_PARAMS_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-  struct lds_event *lds_evt = NULL;
-
-  if (ctxt) {
-    lds_evt = (struct lds_event*)malloc(sizeof(struct lds_event));
-    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);
+  Gom_ctxt result = NULL;
+
+  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));
+      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:
+	    family_add_lss(ctxt, lds_evt); break;
+	  case REC_INDI:
+	    individual_add_lio(ctxt, lds_evt); break;
+	  default:
+	    UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+	}
+	result = MAKE_GOM_CTXT(elt, lds_event, lds_evt);
+      }
     }
   }
 
-  return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, lds_event, lds_evt);
+  return (Gedcom_ctxt)result;
 }
 
 STRING_CB(lds_event, sub_lds_event_stat_start, date_status)
@@ -92,30 +107,85 @@ void lds_event_subscribe()
 void lds_event_add_note(Gom_ctxt ctxt, struct note_sub* note)
 {
   struct lds_event *lds = SAFE_CTXT_CAST(lds_event, ctxt);
-  LINK_CHAIN_ELT(note_sub, lds->note, note)    
+  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);
-  LINK_CHAIN_ELT(source_citation, lds->citation, cit)    
+  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);
-  LINK_CHAIN_ELT(user_data, obj->extra, data)
+  if (obj)
+    LINK_CHAIN_ELT(user_data, obj->extra, data);
 }
 
 void lds_event_cleanup(struct lds_event* lds)
 {
   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, 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, citation_cleanup);  
+    DESTROY_CHAIN_ELTS(note_sub, lds->note, note_sub_cleanup);
+    DESTROY_CHAIN_ELTS(user_data, lds->extra, user_data_cleanup);
+  }
+}
+
+static int get_gedcom_elt(int parsed_tag)
+{
+  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;
+}
+  
+int write_lds_events(Gedcom_write_hndl hndl, int parent, struct lds_event *lds)
+{
+  int result = 0;
+  struct lds_event* obj;
+
+  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;
 }