X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fnote.c;h=2f1cba243ca61bd00efb4bb07bbf483608d62e30;hb=8073f669d16f11bfd50d42bb2cf6fdb79d358565;hp=46e88e3673f2e385b2fbbe00ed063db8b0e1b8d4;hpb=7ea4ef8cae7b52f2bf66371a5e7b493cbd12900e;p=gedcom-parse.git

diff --git a/gom/note.c b/gom/note.c
index 46e88e3..2f1cba2 100644
--- a/gom/note.c
+++ b/gom/note.c
@@ -39,108 +39,78 @@ struct note* gom_first_note = NULL;
 
 Gedcom_ctxt note_start(_REC_PARAMS_)
 {
+  Gom_ctxt result = NULL;
   struct xref_value* xr = GEDCOM_XREF_PTR(xref);
   struct note* note = (struct note*) xr->object;
-  if (! xr->object) {
-    note = make_note_record(xr->string);
+  if (! note) {
+    note = MAKEFUNC(note)(xr->string);
     xr->object = (Gedcom_ctxt) note;
   }
-  note->text = strdup(GEDCOM_STRING(parsed_value));
-  return (Gedcom_ctxt) MAKE_GOM_CTXT(rec, note, xr->object);
+  if (note)
+    result = MAKE_GOM_CTXT(rec, note, xr->object);
+  return (Gedcom_ctxt)result;
 }
 
-GET_REC_BY_XREF(note, XREF_NOTE, gom_get_note_by_xref)
+DEFINE_MAKEFUNC(note, gom_first_note)
+DEFINE_DESTROYFUNC(note, gom_first_note)
+DEFINE_ADDFUNC(note, XREF_NOTE)
+DEFINE_DELETEFUNC(note)
+DEFINE_GETXREFFUNC(note, XREF_NOTE)
+     
+DEFINE_STRING_END_REC_CB(note, note_end, text)
+
+DEFINE_ADDFUNC2(note, source_citation, citation)
+DEFINE_ADDFUNC2(note, user_ref_number, ref)
+DEFINE_ADDFUNC2(note, user_data, extra)
+DEFINE_ADDFUNC2_NOLIST(note, change_date, change_date)
+DEFINE_ADDFUNC2_STR(note, record_id)
      
 Gedcom_ctxt sub_cont_conc_start(_ELT_PARAMS_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-
-  if (ctxt) {
-    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);
-    }
-    return (Gedcom_ctxt) make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
-  }
-  else {
-    return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, NULL, NULL);
-  }
+  Gom_ctxt result = NULL;
+
+  if (! ctxt)
+    NO_CONTEXT;
+  else
+    result = dup_gom_ctxt(ctxt, elt);
+  
+  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);
-  note->text = concat_strings (type, note->text, str);
-}
-
-void note_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
-{
-  struct note *note = SAFE_CTXT_CAST(note, ctxt);
-  LINK_CHAIN_ELT(source_citation, note->citation, cit)    
-}
-
-void note_add_user_ref(Gom_ctxt ctxt, struct user_ref_number* ref)
-{
-  struct note *note = SAFE_CTXT_CAST(note, ctxt);
-  LINK_CHAIN_ELT(user_ref_number, note->ref, ref)
-}
-
-void note_set_record_id(Gom_ctxt ctxt, char *rin)
-{
-  struct note *note = SAFE_CTXT_CAST(note, ctxt);
-  note->record_id = strdup(rin);
-}
-
-void note_set_change_date(Gom_ctxt ctxt, struct change_date* chan)
-{
-  struct note *note = SAFE_CTXT_CAST(note, ctxt);
-  note->change_date = chan;
-}
-
-void note_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void UNREFALLFUNC(note)(struct note *obj)
 {
-  struct note *obj = SAFE_CTXT_CAST(note, ctxt);
-  LINK_CHAIN_ELT(user_data, obj->extra, data)
+  if (obj) {
+    UNREFALLFUNC(source_citation)(obj->citation);
+    UNREFALLFUNC(user_ref_number)(obj->ref);
+    UNREFALLFUNC(change_date)(obj->change_date);
+    UNREFALLFUNC(user_data)(obj->extra);
+  }
 }
 
-void note_cleanup(struct note* note)
+void CLEANFUNC(note)(struct note* note)
 {
-  SAFE_FREE(note->xrefstr);
-  SAFE_FREE(note->text);
-  DESTROY_CHAIN_ELTS(source_citation, note->citation, citation_cleanup)
-  DESTROY_CHAIN_ELTS(user_ref_number, note->ref, user_ref_cleanup)
-  SAFE_FREE(note->record_id);
-  change_date_cleanup(note->change_date);
-  DESTROY_CHAIN_ELTS(user_data, note->extra, user_data_cleanup)
+  if (note) {
+    SAFE_FREE(note->xrefstr);
+    SAFE_FREE(note->text);
+    DESTROY_CHAIN_ELTS(source_citation, note->citation);
+    DESTROY_CHAIN_ELTS(user_ref_number, note->ref);
+    SAFE_FREE(note->record_id);
+    CLEANFUNC(change_date)(note->change_date);
+    DESTROY_CHAIN_ELTS(user_data, note->extra);
+  }
 }
 
 void notes_cleanup()
 {
-  DESTROY_CHAIN_ELTS(note, gom_first_note, note_cleanup);
+  DESTROY_CHAIN_ELTS(note, gom_first_note);
 }
 
 struct note* gom_get_first_note()
@@ -148,10 +118,26 @@ struct note* gom_get_first_note()
   return gom_first_note;
 }
 
-struct note* make_note_record(char* xrefstr)
+int write_notes(Gedcom_write_hndl hndl)
 {
-  struct note* note;
-  MAKE_CHAIN_ELT(note, gom_first_note, note);
-  note->xrefstr = strdup(xrefstr);
-  return note;
+  int result = 0;
+  struct note* obj;
+
+  for (obj = gom_first_note; obj; obj = obj->next) {
+    result |= gedcom_write_record_str(hndl, REC_NOTE, obj->xrefstr, obj->text);
+    if (obj->citation)
+      result |= write_citations(hndl, REC_NOTE, obj->citation);
+    if (obj->ref)
+      result |= write_user_refs(hndl, REC_NOTE, obj->ref);
+    if (obj->record_id)
+      result |= gedcom_write_element_str(hndl, ELT_SUB_IDENT_RIN, 0,
+					 REC_NOTE, obj->record_id);
+    if (obj->change_date)
+      result |= write_change_date(hndl, REC_NOTE, obj->change_date);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);
+  }
+  
+  return result;
 }
+