X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fheader.c;h=448059aa0e8ba341fdb735754cc27c367c7167fd;hb=d069cfbd954ca8d53d780ce97d7da1d363bb51fe;hp=130d06e06ad110614d8082ec228d7e6f76dbf7ee;hpb=e5f86c3d527897be1f7e7135ffdfc023831aaebd;p=gedcom-parse.git

diff --git a/gom/header.c b/gom/header.c
index 130d06e..448059a 100644
--- a/gom/header.c
+++ b/gom/header.c
@@ -60,7 +60,8 @@ 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)
 {
@@ -83,18 +84,6 @@ void header_add_phone(Gom_ctxt ctxt, const char* phone)
   }
 }
 
-void header_add_to_note(NL_TYPE type, Gom_ctxt ctxt, const char* str)
-{
-  struct header *head = SAFE_CTXT_CAST(header, ctxt);
-  if (head) {
-    char *newvalue = concat_strings(type, head->note, str);
-    if (newvalue)
-      head->note = newvalue;
-    else
-      MEMORY_ERROR;
-  }
-}
-
 void header_add_user_data(Gom_ctxt ctxt, struct user_data* data)
 {
   struct header *head = SAFE_CTXT_CAST(header, ctxt);
@@ -138,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()
@@ -177,72 +166,97 @@ struct header* gom_get_header()
 int write_header(Gedcom_write_hndl hndl)
 {
   int result = 0;
+  int i;
   
-  result |= gedcom_write_record_str(hndl, REC_HEAD, NULL, NULL, NULL);
+  result |= gedcom_write_record_str(hndl, REC_HEAD, 0, NULL, NULL);
+  if (gom_header.charset.name)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_CHAR, 0,
+				       REC_HEAD,
+				       gom_header.charset.name);
+  if (gom_header.charset.version)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_CHAR_VERS, 0,
+				       ELT_HEAD_CHAR,
+				       gom_header.charset.version);
   if (gom_header.source.id)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR, NULL, REC_HEAD,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR, 0, REC_HEAD,
 				       gom_header.source.id);
   if (gom_header.source.name)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_NAME, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_NAME, 0,
 				       ELT_HEAD_SOUR,
 				       gom_header.source.name);
   if (gom_header.source.version)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_VERS, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_VERS, 0,
 				       ELT_HEAD_SOUR,
 				       gom_header.source.version);
   if (gom_header.source.corporation.name)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_CORP, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_CORP, 0,
 				       ELT_HEAD_SOUR,
 				       gom_header.source.corporation.name);
+  if (gom_header.source.corporation.address)
+    result |= write_address(hndl, ELT_HEAD_SOUR_CORP,
+			    gom_header.source.corporation.address);
+  for (i = 0; i < 3 && gom_header.source.corporation.phone[i]; i++)
+    result |= gedcom_write_element_str(hndl, ELT_SUB_PHON, 0, ELT_HEAD_SOUR_CORP,
+				       gom_header.source.corporation.phone[i]);
   if (gom_header.source.data.name)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_DATA, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_DATA, 0,
 				       ELT_HEAD_SOUR,
 				       gom_header.source.data.name);
+  if (gom_header.source.data.date)
+    result |= gedcom_write_element_date(hndl, ELT_HEAD_SOUR_DATA_DATE, 0,
+					ELT_HEAD_SOUR_DATA,
+					gom_header.source.data.date);
   if (gom_header.source.data.copyright)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_DATA_COPR, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_SOUR_DATA_COPR, 0,
 				       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,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_DEST, 0, REC_HEAD,
 				       gom_header.destination);
+  if (gom_header.date)
+    result |= gedcom_write_element_date(hndl, ELT_HEAD_DATE, 0, REC_HEAD,
+					gom_header.date);
+  if (gom_header.time)
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_DATE_TIME, 0,
+				       ELT_HEAD_DATE, gom_header.time);
+  if (gom_header.submitter)
+    result |= gedcom_write_element_xref(hndl, ELT_HEAD_SUBM, 0, REC_HEAD,
+					gom_header.submitter);
+  if (gom_header.submission)
+    result |= gedcom_write_element_xref(hndl, ELT_HEAD_SUBN, 0, REC_HEAD,
+					gom_header.submission);
   if (gom_header.filename)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_FILE, NULL, REC_HEAD,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_FILE, 0, REC_HEAD,
 				       gom_header.filename);
   if (gom_header.copyright)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_COPR, NULL, REC_HEAD,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_COPR, 0, REC_HEAD,
 				       gom_header.copyright);
-  result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC, NULL, REC_HEAD,
+  result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC, 0, REC_HEAD,
 				     NULL);
   if (gom_header.gedcom.version)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC_VERS, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC_VERS, 0,
 				       ELT_HEAD_GEDC,
 				       gom_header.gedcom.version);
   if (gom_header.gedcom.form)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC_FORM, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_GEDC_FORM, 0,
 				       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,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_LANG, 0,
 				       REC_HEAD,
 				       gom_header.language);
   if (gom_header.place_hierarchy) {
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_PLAC, NULL, REC_HEAD,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_PLAC, 0, REC_HEAD,
 				       NULL);
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_PLAC_FORM, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_PLAC_FORM, 0,
 				       ELT_HEAD_PLAC,
 				       gom_header.place_hierarchy);
   }
   if (gom_header.note)
-    result |= gedcom_write_element_str(hndl, ELT_HEAD_NOTE, NULL,
+    result |= gedcom_write_element_str(hndl, ELT_HEAD_NOTE, 0,
 				       REC_HEAD,
 				       gom_header.note);
+  if (gom_header.extra)
+    result |= write_user_data(hndl, gom_header.extra);
   return result;
 }