Completed writing of strings and xrefs.

[gedcom-parse.git] / gom / header.c

diff --git a/gom/header.c b/gom/header.c
index c5360012f37b1acc42cc6ec19f7f8b52cbfbcb41..04b00542ff0865c550e39e0a6ae210cc80e3a818 100644 (file)
--- a/gom/header.c
+++ b/gom/header.c
@@ -166,72 +166,87 @@ 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.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.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;
 }