X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fheader.c;h=c5360012f37b1acc42cc6ec19f7f8b52cbfbcb41;hb=f8536669a2c38054a067bfe1596f90744b6c58da;hp=ddc25895d000afff5b224c557a9d4c0450e5cf50;hpb=7ea4ef8cae7b52f2bf66371a5e7b493cbd12900e;p=gedcom-parse.git

diff --git a/gom/header.c b/gom/header.c
index ddc2589..c536001 100644
--- a/gom/header.c
+++ b/gom/header.c
@@ -60,36 +60,35 @@ STRING_CB(header, head_char_vers_start, charset.version)
 STRING_CB(header, head_lang_start, language)
 NULL_CB(header, head_plac_start)
 STRING_CB(header, head_plac_form_start, place_hierarchy)
-STRING_CB(header, head_note_start, note)
+NULL_CB(header, head_note_start) /* the end callback will fill the value */
+STRING_END_CB(header, head_note_end, note)
      
 void header_add_address(Gom_ctxt ctxt, struct address* addr)
 {
   struct header *head = SAFE_CTXT_CAST(header, ctxt);
-  head->source.corporation.address = addr;
+  if (head)
+    head->source.corporation.address = addr;
 }
 
-void header_add_phone(Gom_ctxt ctxt, char* phone)
+void header_add_phone(Gom_ctxt ctxt, const char* phone)
 {
   struct header *head = SAFE_CTXT_CAST(header, ctxt);
-  struct header_corporation *corp = &(head->source.corporation);
-  if (! corp->phone[0])
-    corp->phone[0] = strdup(phone);
-  else if (! corp->phone[1])
-    corp->phone[1] = strdup(phone);
-  else if (! corp->phone[2])
-    corp->phone[2] = strdup(phone);
-}
-
-void header_add_to_note(NL_TYPE type, Gom_ctxt ctxt, char* str)
-{
-  struct header *head = SAFE_CTXT_CAST(header, ctxt);
-  head->note = concat_strings (type, head->note, str);
+  if (head) {
+    struct header_corporation *corp = &(head->source.corporation);
+    int i = 0;
+    while (i<2 && corp->phone[i]) i++;
+    if (! corp->phone[i]) {
+      corp->phone[i] = strdup(phone);
+      if (! corp->phone[i]) MEMORY_ERROR;
+    }
+  }
 }
 
 void header_add_user_data(Gom_ctxt ctxt, struct user_data* data)
 {
   struct header *head = SAFE_CTXT_CAST(header, ctxt);
-  LINK_CHAIN_ELT(user_data, head->extra, data)
+  if (head)
+    LINK_CHAIN_ELT(user_data, head->extra, data);
 }
 
 void header_subscribe()
@@ -128,7 +127,7 @@ void header_subscribe()
   gedcom_subscribe_to_element(ELT_HEAD_PLAC, head_plac_start, def_elt_end);
   gedcom_subscribe_to_element(ELT_HEAD_PLAC_FORM,
 			      head_plac_form_start, def_elt_end);
-  gedcom_subscribe_to_element(ELT_HEAD_NOTE, head_note_start, def_elt_end);
+  gedcom_subscribe_to_element(ELT_HEAD_NOTE, head_note_start, head_note_end);
 }
 
 void header_cleanup()
@@ -156,10 +155,83 @@ void header_cleanup()
   SAFE_FREE(gom_header.language);
   SAFE_FREE(gom_header.place_hierarchy);
   SAFE_FREE(gom_header.note);
-  DESTROY_CHAIN_ELTS(user_data, gom_header.extra, user_data_cleanup)
+  DESTROY_CHAIN_ELTS(user_data, gom_header.extra, user_data_cleanup);
 }
 
 struct header* gom_get_header()
 {
   return &gom_header;
 }
+
+int write_header(Gedcom_write_hndl hndl)
+{
+  int result = 0;
+  
+  result |= gedcom_write_record_str(hndl, REC_HEAD, NULL, NULL, NULL);
+  if (gom_header.source.id)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR, NULL, REC_HEAD,
+				       gom_header.source.id);
+  if (gom_header.source.name)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_NAME, NULL,
+				       ELT_HEAD_SOUR,
+				       gom_header.source.name);
+  if (gom_header.source.version)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_VERS, NULL,
+				       ELT_HEAD_SOUR,
+				       gom_header.source.version);
+  if (gom_header.source.corporation.name)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_CORP, NULL,
+				       ELT_HEAD_SOUR,
+				       gom_header.source.corporation.name);
+  if (gom_header.source.data.name)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_DATA, NULL,
+				       ELT_HEAD_SOUR,
+				       gom_header.source.data.name);
+  if (gom_header.source.data.copyright)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_DATA_COPR, NULL,
+				       ELT_HEAD_SOUR_DATA,
+				       gom_header.source.data.copyright);
+  if (gom_header.destination)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_DEST, NULL, REC_HEAD,
+				       gom_header.destination);
+  if (gom_header.filename)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_FILE, NULL, REC_HEAD,
+				       gom_header.filename);
+  if (gom_header.copyright)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_COPR, NULL, REC_HEAD,
+				       gom_header.copyright);
+  result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC, NULL, REC_HEAD,
+				     NULL);
+  if (gom_header.gedcom.version)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC_VERS, NULL,
+				       ELT_HEAD_GEDC,
+				       gom_header.gedcom.version);
+  if (gom_header.gedcom.form)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC_FORM, NULL,
+				       ELT_HEAD_GEDC,
+				       gom_header.gedcom.form);
+  if (gom_header.charset.name)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_CHAR, NULL,
+				       REC_HEAD,
+				       gom_header.charset.name);
+  if (gom_header.charset.version)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_CHAR_VERS, NULL,
+				       ELT_HEAD_CHAR,
+				       gom_header.charset.version);
+  if (gom_header.language)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_LANG, NULL,
+				       REC_HEAD,
+				       gom_header.language);
+  if (gom_header.place_hierarchy) {
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_PLAC, NULL, REC_HEAD,
+				       NULL);
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_PLAC_FORM, NULL,
+				       ELT_HEAD_PLAC,
+				       gom_header.place_hierarchy);
+  }
+  if (gom_header.note)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_NOTE, NULL,
+				       REC_HEAD,
+				       gom_header.note);
+  return result;
+}