X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fnote.c;h=b3ff3700ef9ea159bf2abdf1cdf5bd97580227a8;hb=5b045164f4a11b1f4d709820e784e1ca77b61b3f;hp=4443da29045f7cea460146b6f47d90e555905b1b;hpb=bdf47fdee469d5a1d7ddfd06a0e4b26f3b40b0f4;p=gedcom-parse.git

diff --git a/gom/note.c b/gom/note.c
index 4443da2..b3ff370 100644
--- a/gom/note.c
+++ b/gom/note.c
@@ -56,6 +56,25 @@ Gedcom_ctxt note_start(_REC_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
+void note_end(_REC_END_PARAMS_)
+{
+  Gom_ctxt ctxt = (Gom_ctxt)self;
+
+  if (! ctxt)
+    NO_CONTEXT;
+  else {
+    struct note *note = SAFE_CTXT_CAST(note, ctxt);
+    if (note) {
+      char *str = GEDCOM_STRING(parsed_value);
+      char *newvalue = strdup(str);
+      if (! newvalue)
+	MEMORY_ERROR;
+      else
+	note->text = newvalue;
+    }
+  }
+}
+
 GET_REC_BY_XREF(note, XREF_NOTE, gom_get_note_by_xref)
      
 Gedcom_ctxt sub_cont_conc_start(_ELT_PARAMS_)
@@ -65,52 +84,19 @@ Gedcom_ctxt sub_cont_conc_start(_ELT_PARAMS_)
 
   if (! ctxt)
     NO_CONTEXT;
-  else {
-    char *str = GEDCOM_STRING(parsed_value);
-    NL_TYPE type = (elt == ELT_SUB_CONT ? WITH_NL : WITHOUT_NL);
-    switch (ctxt->ctxt_type) {
-      case ELT_HEAD_NOTE:
-	header_add_to_note(type, ctxt, str); break;
-      case ELT_SUB_SOUR:
-	citation_add_to_desc(type, ctxt, str); break;
-      case ELT_SUB_SOUR_TEXT:
-	citation_add_to_text(type, ctxt, str); break;
-      case ELT_SUB_NOTE:
-	note_sub_add_to_note(type, ctxt, str); break;
-      case REC_NOTE:
-	note_add_to_note(type, ctxt, str); break;
-      case ELT_SOUR_AUTH:
-      case ELT_SOUR_TITL:
-      case ELT_SOUR_PUBL:
-      case ELT_SOUR_TEXT:
-	source_add_to_value(type, ctxt, str); break;
-      default:
-	UNEXPECTED_CONTEXT(ctxt->ctxt_type);
-    }
+  else
     result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
-  }
+  
   return (Gedcom_ctxt)result;
 }
 
 void note_subscribe()
 {
-  gedcom_subscribe_to_record(REC_NOTE, note_start, def_rec_end);
+  gedcom_subscribe_to_record(REC_NOTE, note_start, note_end);
   gedcom_subscribe_to_element(ELT_SUB_CONT, sub_cont_conc_start, def_elt_end);
   gedcom_subscribe_to_element(ELT_SUB_CONC, sub_cont_conc_start, def_elt_end);
 }
 
-void note_add_to_note(NL_TYPE type, Gom_ctxt ctxt, char* str)
-{
-  struct note *note = SAFE_CTXT_CAST(note, ctxt);
-  if (note) {
-    char *newvalue = concat_strings (type, note->text, str);
-    if (newvalue)
-      note->text = newvalue;
-    else
-      MEMORY_ERROR;
-  }
-}
-
 void note_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
 {
   struct note *note = SAFE_CTXT_CAST(note, ctxt);
@@ -125,7 +111,7 @@ void note_add_user_ref(Gom_ctxt ctxt, struct user_ref_number* ref)
     LINK_CHAIN_ELT(user_ref_number, note->ref, ref);
 }
 
-void note_set_record_id(Gom_ctxt ctxt, char *rin)
+void note_set_record_id(Gom_ctxt ctxt, const char *rin)
 {
   struct note *note = SAFE_CTXT_CAST(note, ctxt);
   if (note) {
@@ -171,7 +157,7 @@ struct note* gom_get_first_note()
   return gom_first_note;
 }
 
-struct note* make_note_record(char* xrefstr)
+struct note* make_note_record(const char* xrefstr)
 {
   struct note* note = NULL;
   MAKE_CHAIN_ELT(note, gom_first_note, note);