X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Ffamily_link.c;h=fe3f67997aa1f5d9872a25ff555ecc984d74d4de;hb=8073f669d16f11bfd50d42bb2cf6fdb79d358565;hp=dfffbd593fe8bb6b55b7efd571dd1a3add5dd46f;hpb=7ea4ef8cae7b52f2bf66371a5e7b493cbd12900e;p=gedcom-parse.git

diff --git a/gom/family_link.c b/gom/family_link.c
index dfffbd5..fe3f679 100644
--- a/gom/family_link.c
+++ b/gom/family_link.c
@@ -34,34 +34,65 @@
 Gedcom_ctxt sub_fam_link_start(_ELT_PARAMS_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-  struct family_link *link = NULL;
-
-  if (ctxt) {
-    link = (struct family_link *)malloc(sizeof(struct family_link));
-    memset (link, 0, sizeof(struct family_link));
-    link->family = GEDCOM_XREF_PTR(parsed_value);
-
-    switch (ctxt->ctxt_type) {
-      case REC_INDI:
-	individual_add_family_link(ctxt, elt, link); break;
-      default:
-	UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+  Gom_ctxt result = NULL;
+
+  if (! ctxt)
+    NO_CONTEXT;
+  else {
+    struct family_link *link = SUB_MAKEFUNC(family_link)();
+    if (link) {
+      int type = ctxt_type(ctxt);
+      link->family = GEDCOM_XREF_PTR(parsed_value);
+      
+      switch (type) {
+	case REC_INDI:
+	  ADDFUNC2(individual,family_link)(ctxt, elt, link); break;
+	default:
+	  UNEXPECTED_CONTEXT(type);
+      }
+      result = MAKE_GOM_CTXT(elt, family_link, link);
     }
   }
 
-  return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, family_link, link);
+  return (Gedcom_ctxt)result;
 }
 
 Gedcom_ctxt sub_fam_link_pedi_start(_ELT_PARAMS_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-  struct family_link *link = SAFE_CTXT_CAST(family_link, ctxt);
-  struct pedigree *ped;
-  MAKE_CHAIN_ELT(pedigree, link->pedigree, ped);
-  ped->pedigree = strdup(GEDCOM_STRING(parsed_value));
-  return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, pedigree, ped);
+  Gom_ctxt result = NULL;
+
+  if (! ctxt)
+    NO_CONTEXT;
+  else {
+    struct family_link *link = SAFE_CTXT_CAST(family_link, ctxt);
+    if (link) {
+      int err = 0;
+      struct pedigree *ped = NULL;
+      MAKE_CHAIN_ELT(pedigree, link->pedigree, ped);
+      if (ped) {
+	ped->pedigree = strdup(GEDCOM_STRING(parsed_value));
+	if (! ped->pedigree) {
+	  MEMORY_ERROR;
+	  err = 1;
+	}
+      }
+      if (! err)
+	result = MAKE_GOM_CTXT(elt, pedigree, ped);
+    }
+  }
+  return (Gedcom_ctxt)result;
 }
 
+DEFINE_SUB_MAKEFUNC(family_link)
+DEFINE_SUB_ADDFUNC(family_link)
+DEFINE_SUB_FINDFUNC(family_link)
+DEFINE_SUB_REMOVEFUNC(family_link)
+DEFINE_SUB_MOVEFUNC(family_link)
+     
+DEFINE_ADDFUNC2(family_link, note_sub, note)
+DEFINE_ADDFUNC2(family_link, user_data, extra)
+
 void family_link_subscribe()
 {
   gedcom_subscribe_to_element(ELT_SUB_FAMC, sub_fam_link_start,
@@ -72,30 +103,87 @@ void family_link_subscribe()
 			      def_elt_end);
 }
 
-void family_link_add_note(Gom_ctxt ctxt, struct note_sub* note)
+void UNREFALLFUNC(pedigree)(struct pedigree* obj)
 {
-  struct family_link *link = SAFE_CTXT_CAST(family_link, ctxt);
-  LINK_CHAIN_ELT(note_sub, link->note, note)
+  if (obj) {
+    struct pedigree* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
 }
 
-void family_link_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void CLEANFUNC(pedigree)(struct pedigree* ped)
 {
-  struct family_link *obj = SAFE_CTXT_CAST(family_link, ctxt);
-  LINK_CHAIN_ELT(user_data, obj->extra, data)
+  if (ped) {
+    SAFE_FREE(ped->pedigree);
+  }
 }
 
-void pedigree_cleanup(struct pedigree* ped)
+DEFINE_SUB_MAKEFUNC(pedigree)
+DEFINE_SUB_ADDFUNC(pedigree)
+DEFINE_SUB_FINDFUNC(pedigree)
+DEFINE_SUB_REMOVEFUNC(pedigree)
+DEFINE_SUB_MOVEFUNC(pedigree)
+     
+void UNREFALLFUNC(family_link)(struct family_link* obj)
 {
-  if (ped) {
-    SAFE_FREE(ped->pedigree);
+  if (obj) {
+    struct family_link* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->family);
+      UNREFALLFUNC(pedigree)(runner->pedigree);
+      UNREFALLFUNC(note_sub)(runner->note);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
   }
 }
 
-void family_link_cleanup(struct family_link *link)
+void CLEANFUNC(family_link)(struct family_link *link)
 {
   if (link) {
-    DESTROY_CHAIN_ELTS(pedigree, link->pedigree, pedigree_cleanup)
-    DESTROY_CHAIN_ELTS(note_sub, link->note, note_sub_cleanup)
-    DESTROY_CHAIN_ELTS(user_data, link->extra, user_data_cleanup)
+    DESTROY_CHAIN_ELTS(pedigree, link->pedigree);
+    DESTROY_CHAIN_ELTS(note_sub, link->note);
+    DESTROY_CHAIN_ELTS(user_data, link->extra);
   }
 }
+
+int write_pedigrees(Gedcom_write_hndl hndl, int parent, struct pedigree* ped)
+{
+  int result = 0;
+  struct pedigree* obj;
+
+  if (!ped) return 1;
+
+  for (obj = ped; obj; obj = obj->next) {
+    result |= gedcom_write_element_str(hndl, ELT_SUB_FAMC_PEDI, 0, parent,
+				       obj->pedigree);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);  
+  }
+  
+  return result;
+}
+
+int write_family_links(Gedcom_write_hndl hndl, int parent, LinkType type,
+		       struct family_link *link)
+{
+  int result = 0;
+  struct family_link* obj;
+  int elt = (type == LINK_TYPE_CHILD ? ELT_SUB_FAMC : ELT_SUB_FAMS);
+
+  if (!link) return 1;
+
+  for (obj = link; obj; obj = obj->next) {
+    result |= gedcom_write_element_xref(hndl, elt, 0, parent,
+					obj->family);
+    if (obj->pedigree)
+      result |= write_pedigrees(hndl, elt, obj->pedigree);
+    if (obj->note)
+      result |= write_note_subs(hndl, elt, obj->note);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);      
+  }
+
+  return result;
+}