X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Faddress.c;h=58d11758b41b284ac1467dd6bd916afcd9c684cb;hb=8073f669d16f11bfd50d42bb2cf6fdb79d358565;hp=1766d937164677dc659b34dcbddfd9a9b157e896;hpb=f8536669a2c38054a067bfe1596f90744b6c58da;p=gedcom-parse.git

diff --git a/gom/address.c b/gom/address.c
index 1766d93..58d1175 100644
--- a/gom/address.c
+++ b/gom/address.c
@@ -41,14 +41,12 @@ Gedcom_ctxt sub_addr_start(_ELT_PARAMS_)
   if (!ctxt)
     NO_CONTEXT;
   else {
-    struct address *addr = (struct address *)malloc(sizeof(struct address));
-    if (!addr)
-      MEMORY_ERROR;
-    else {
-      memset (addr, 0, sizeof(struct address));
-      switch (ctxt->ctxt_type) {
+    struct address *addr = SUB_MAKEFUNC(address)();
+    if (addr) {
+      int type = ctxt_type(ctxt);
+      switch (type) {
 	case ELT_HEAD_SOUR_CORP:
-	  header_add_address(ctxt, addr); break;
+	  ADDFUNC2_NOLIST(header,address)(ctxt, addr); break;
 	case ELT_SUB_FAM_EVT:
 	case ELT_SUB_FAM_EVT_EVEN:
 	case ELT_SUB_INDIV_ATTR:
@@ -57,13 +55,13 @@ Gedcom_ctxt sub_addr_start(_ELT_PARAMS_)
 	case ELT_SUB_INDIV_GEN:
 	case ELT_SUB_INDIV_ADOP:
 	case ELT_SUB_INDIV_EVEN:
-	  event_add_address(ctxt, addr); break;
+	  ADDFUNC2_NOLIST(event,address)(ctxt, addr); break;
 	case REC_REPO:
-	  repository_add_address(ctxt, addr); break;
+	  ADDFUNC2_NOLIST(repository,address)(ctxt, addr); break;
 	case REC_SUBM:
-	  submitter_add_address(ctxt, addr); break;
+	  ADDFUNC2_NOLIST(submitter,address)(ctxt, addr); break;
 	default:
-	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+	  UNEXPECTED_CONTEXT(type);
       }
       result = MAKE_GOM_CTXT(elt, address, addr);
     }
@@ -79,18 +77,24 @@ Gedcom_ctxt sub_addr_cont_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    result = make_gom_ctxt(elt, ctxt->ctxt_type, ctxt->ctxt_ptr);
+    result = dup_gom_ctxt(ctxt, elt);
   }
   return (Gedcom_ctxt)result;
 }
 
-STRING_END_CB(address, sub_addr_end, full_label)
-STRING_CB(address, sub_addr_adr1_start, line1)
-STRING_CB(address, sub_addr_adr2_start, line2)
-STRING_CB(address, sub_addr_city_start, city)
-STRING_CB(address, sub_addr_stae_start, state)
-STRING_CB(address, sub_addr_post_start, postal)
-STRING_CB(address, sub_addr_ctry_start, country)
+DEFINE_SUB_MAKEFUNC(address)
+DEFINE_SUB_SETFUNC(address)
+DEFINE_SUB_DELETEFUNC(address)
+
+DEFINE_STRING_END_CB(address, sub_addr_end, full_label)
+DEFINE_STRING_CB(address, sub_addr_adr1_start, line1)
+DEFINE_STRING_CB(address, sub_addr_adr2_start, line2)
+DEFINE_STRING_CB(address, sub_addr_city_start, city)
+DEFINE_STRING_CB(address, sub_addr_stae_start, state)
+DEFINE_STRING_CB(address, sub_addr_post_start, postal)
+DEFINE_STRING_CB(address, sub_addr_ctry_start, country)
+
+DEFINE_ADDFUNC2(address, user_data, extra)
 
 Gedcom_ctxt sub_phon_start(_ELT_PARAMS_)
 {
@@ -101,7 +105,8 @@ Gedcom_ctxt sub_phon_start(_ELT_PARAMS_)
     NO_CONTEXT;
   else {
     char *str = GEDCOM_STRING(parsed_value);
-    switch (ctxt->ctxt_type) {
+    int type = ctxt_type(ctxt);
+    switch (type) {
       case ELT_HEAD_SOUR_CORP:
 	header_add_phone(ctxt, str); break;
       case ELT_SUB_FAM_EVT:
@@ -117,9 +122,9 @@ Gedcom_ctxt sub_phon_start(_ELT_PARAMS_)
       case REC_SUBM:
 	submitter_add_phone(ctxt, str); break;
       default:
-	UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+	UNEXPECTED_CONTEXT(type);
     }
-    result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+    result = dup_gom_ctxt(ctxt, elt);
   }
   return (Gedcom_ctxt)result;
 }
@@ -144,14 +149,14 @@ void address_subscribe()
   gedcom_subscribe_to_element(ELT_SUB_PHON, sub_phon_start, def_elt_end);
 }
 
-void address_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void UNREFALLFUNC(address)(struct address *address)
 {
-  struct address *obj = SAFE_CTXT_CAST(address, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
+  if (address) {
+    UNREFALLFUNC(user_data)(address->extra);
+  }
 }
 
-void address_cleanup(struct address *address)
+void CLEANFUNC(address)(struct address *address)
 {
   if (address) {
     SAFE_FREE(address->full_label);
@@ -161,7 +166,40 @@ void address_cleanup(struct address *address)
     SAFE_FREE(address->state);
     SAFE_FREE(address->postal);
     SAFE_FREE(address->country);
-    DESTROY_CHAIN_ELTS(user_data, address->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(user_data, address->extra);
   }
   SAFE_FREE(address);
 }
+
+int write_address(Gedcom_write_hndl hndl, int parent, struct address *address)
+{
+  int result = 0;
+
+  if (!address) return 1;
+  
+  if (address->full_label)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_ADDR, 0, parent,
+				       address->full_label);
+  if (address->line1)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_ADDR_ADR1, 0,
+				       ELT_SUB_ADDR, address->line1);
+  if (address->line2)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_ADDR_ADR2, 0,
+				       ELT_SUB_ADDR, address->line2);
+  if (address->city)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_ADDR_CITY, 0,
+				       ELT_SUB_ADDR, address->city);
+  if (address->state)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_ADDR_STAE, 0,
+				       ELT_SUB_ADDR, address->state);
+  if (address->postal)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_ADDR_POST, 0,
+				       ELT_SUB_ADDR, address->postal);
+  if (address->country)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_ADDR_CTRY, 0,
+				       ELT_SUB_ADDR, address->country);
+  if (address->extra)
+    result |= write_user_data(hndl, address->extra);
+
+  return result;
+}