X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Faddress.c;h=6c0332a64a89727d4f1fa3ab61a2a9541c3703c3;hb=39bb8d4c3317074cfa3e8e92cc12e6160675e246;hp=f8972e616f73f7dc290a728bfaf496ba5fcc733f;hpb=bdf47fdee469d5a1d7ddfd06a0e4b26f3b40b0f4;p=gedcom-parse.git

diff --git a/gom/address.c b/gom/address.c
index f8972e6..6c0332a 100644
--- a/gom/address.c
+++ b/gom/address.c
@@ -45,36 +45,27 @@ Gedcom_ctxt sub_addr_start(_ELT_PARAMS_)
     if (!addr)
       MEMORY_ERROR;
     else {
-      char *str = GEDCOM_STRING(parsed_value);
       memset (addr, 0, sizeof(struct address));
-      addr->full_label = strdup(str);
-      
-      if (! addr->full_label) {
-	MEMORY_ERROR;
-	free(addr);
-      }
-      else {
-	switch (ctxt->ctxt_type) {
-	  case ELT_HEAD_SOUR_CORP:
-	    header_add_address(ctxt, addr); break;
-	  case ELT_SUB_FAM_EVT:
-	  case ELT_SUB_FAM_EVT_EVEN:
-	  case ELT_SUB_INDIV_ATTR:
-	  case ELT_SUB_INDIV_RESI:
-	  case ELT_SUB_INDIV_BIRT:
-	  case ELT_SUB_INDIV_GEN:
-	  case ELT_SUB_INDIV_ADOP:
-	  case ELT_SUB_INDIV_EVEN:
-	    event_add_address(ctxt, addr); break;
-	  case REC_REPO:
-	    repository_add_address(ctxt, addr); break;
-	  case REC_SUBM:
-	    submitter_add_address(ctxt, addr); break;
-	  default:
-	    UNEXPECTED_CONTEXT(ctxt->ctxt_type);
-	}
-	result = MAKE_GOM_CTXT(elt, address, addr);
+      switch (ctxt->ctxt_type) {
+	case ELT_HEAD_SOUR_CORP:
+	  header_add_address(ctxt, addr); break;
+	case ELT_SUB_FAM_EVT:
+	case ELT_SUB_FAM_EVT_EVEN:
+	case ELT_SUB_INDIV_ATTR:
+	case ELT_SUB_INDIV_RESI:
+	case ELT_SUB_INDIV_BIRT:
+	case ELT_SUB_INDIV_GEN:
+	case ELT_SUB_INDIV_ADOP:
+	case ELT_SUB_INDIV_EVEN:
+	  event_add_address(ctxt, addr); break;
+	case REC_REPO:
+	  repository_add_address(ctxt, addr); break;
+	case REC_SUBM:
+	  submitter_add_address(ctxt, addr); break;
+	default:
+	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
       }
+      result = MAKE_GOM_CTXT(elt, address, addr);
     }
   }
   
@@ -88,21 +79,12 @@ Gedcom_ctxt sub_addr_cont_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct address *addr = SAFE_CTXT_CAST(address, ctxt);
-    if (addr) {
-      char *str = GEDCOM_STRING(parsed_value);
-      char *newvalue = concat_strings (WITH_NL, addr->full_label, str);
-      if (! newvalue)
-	MEMORY_ERROR;
-      else {
-	addr->full_label = newvalue;
-	result = MAKE_GOM_CTXT(elt, address, addr);
-      }
-    }
+    result = make_gom_ctxt(elt, ctxt->ctxt_type, ctxt->ctxt_ptr);
   }
   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)
@@ -144,7 +126,7 @@ Gedcom_ctxt sub_phon_start(_ELT_PARAMS_)
 
 void address_subscribe()
 {
-  gedcom_subscribe_to_element(ELT_SUB_ADDR, sub_addr_start, def_elt_end);
+  gedcom_subscribe_to_element(ELT_SUB_ADDR, sub_addr_start, sub_addr_end);
   gedcom_subscribe_to_element(ELT_SUB_ADDR_CONT,
 			      sub_addr_cont_start, def_elt_end);
   gedcom_subscribe_to_element(ELT_SUB_ADDR_ADR1,
@@ -183,3 +165,36 @@ void address_cleanup(struct address *address)
   }
   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;
+}