X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fnote.c;h=41dab5f5697bb3df1e6d639c6ed36f6e5ea0590d;hb=f8536669a2c38054a067bfe1596f90744b6c58da;hp=c6fb9e30673de6862aeea9791b49a1de7f7bbe5d;hpb=4c445928c8f7d30731a66522ffb9747fe13a3243;p=gedcom-parse.git

diff --git a/gom/note.c b/gom/note.c
index c6fb9e3..41dab5f 100644
--- a/gom/note.c
+++ b/gom/note.c
@@ -46,16 +46,12 @@ Gedcom_ctxt note_start(_REC_PARAMS_)
     note = make_note_record(xr->string);
     xr->object = (Gedcom_ctxt) note;
   }
-  if (note) {
-    note->text = strdup(GEDCOM_STRING(parsed_value));
-    if (! note->text)
-      MEMORY_ERROR;
-    else
-      result = MAKE_GOM_CTXT(rec, note, xr->object);
-  }
+  if (note)
+    result = MAKE_GOM_CTXT(rec, note, xr->object);
   return (Gedcom_ctxt)result;
 }
 
+STRING_END_REC_CB(note, note_end, text)
 GET_REC_BY_XREF(note, XREF_NOTE, gom_get_note_by_xref)
      
 Gedcom_ctxt sub_cont_conc_start(_ELT_PARAMS_)
@@ -65,52 +61,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, const 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);