X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Flds_event.c;h=799e23d75431b257447e8c96030ceea8530b3f28;hb=f8f253aa29e3c2561d325cb47cc17a727f76266e;hp=c49872973ee2109f853cf90c04ea3c94a154881a;hpb=72689522e287ca3b2231e7d8881f0fe5bea48f15;p=gedcom-parse.git

diff --git a/gom/lds_event.c b/gom/lds_event.c
index c498729..799e23d 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) {
@@ -70,6 +66,12 @@ Gedcom_ctxt sub_lds_event_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
+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_temp_start, temple_code)
@@ -108,6 +110,19 @@ void lds_event_subscribe()
 			      sub_lds_event_famc_start, def_elt_end);
 }
 
+void UNREFALLFUNC(lds_event)(struct lds_event* obj)
+{
+  if (obj) {
+    struct lds_event* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->family);
+      UNREFALLFUNC(source_citation)(runner->citation);
+      UNREFALLFUNC(note_sub)(runner->note);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
+}
+
 void CLEANFUNC(lds_event)(struct lds_event* lds)
 {
   if (lds) {
@@ -130,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;
+    case TAG_SLGS:
+      obj_elt = ELT_SUB_LSS_SLGS; break;
     default:
       gedcom_warning(_("Internal error: unknown evt tag %d"), parsed_tag);
   }
@@ -145,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);
+    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, 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)
-      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)
-      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)
-      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,