X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fheader.c;h=69fb4dff4c33bc9a0a1070f96bbdc495a2f72714;hb=5b045164f4a11b1f4d709820e784e1ca77b61b3f;hp=130d06e06ad110614d8082ec228d7e6f76dbf7ee;hpb=3fae12a186ba47a970bea1bb2b5ce720f596a26b;p=gedcom-parse.git

diff --git a/gom/header.c b/gom/header.c
index 130d06e..69fb4df 100644
--- a/gom/header.c
+++ b/gom/header.c
@@ -60,8 +60,27 @@ 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 */
      
+void head_note_end(_ELT_END_PARAMS_)
+{
+  Gom_ctxt ctxt = (Gom_ctxt)self;
+
+  if (! ctxt)
+    NO_CONTEXT;
+  else {
+    struct header *head = SAFE_CTXT_CAST(header, ctxt);
+    if (head) {
+      char *str = GEDCOM_STRING(parsed_value);
+      char *newvalue = strdup(str);
+      if (! newvalue)
+	MEMORY_ERROR;
+      else
+	head->note = newvalue;
+    }
+  }
+}
+
 void header_add_address(Gom_ctxt ctxt, struct address* addr)
 {
   struct header *head = SAFE_CTXT_CAST(header, ctxt);
@@ -83,18 +102,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 +145,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()