X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fnote_sub.c;h=f8dedefa46ff1496b7a7d6ee1d48e2060dbe0f08;hb=8073f669d16f11bfd50d42bb2cf6fdb79d358565;hp=bdfb1e692e1d4891593e1a64e1beea8f4eedc3ec;hpb=4c445928c8f7d30731a66522ffb9747fe13a3243;p=gedcom-parse.git

diff --git a/gom/note_sub.c b/gom/note_sub.c
index bdfb1e6..f8dedef 100644
--- a/gom/note_sub.c
+++ b/gom/note_sub.c
@@ -52,114 +52,142 @@ Gedcom_ctxt sub_note_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct note_sub *note = (struct note_sub *)malloc(sizeof(struct note_sub));
-    if (! note)
-      MEMORY_ERROR;
-    else {
-      int err = 0;
-      memset (note, 0, sizeof(struct note_sub));
-      if (GEDCOM_IS_STRING(parsed_value)) {
-	note->text = strdup(GEDCOM_STRING(parsed_value));
-	if (! note->text) {
-	  MEMORY_ERROR;
-	  free(note);
-	  err = 1;
-	}
-      }
-      else if (GEDCOM_IS_XREF_PTR(parsed_value))
+    struct note_sub *note = SUB_MAKEFUNC(note_sub)();
+    if (note) {
+      int type = ctxt_type(ctxt);
+      if (GEDCOM_IS_XREF_PTR(parsed_value))
 	note->reference = GEDCOM_XREF_PTR(parsed_value);
 
-      if (! err) {
-	switch (ctxt->ctxt_type) {
-	  case ELT_SUB_PLAC:
-	    place_add_note(ctxt, note); break;
-	  case ELT_SUB_FAM_EVT:
-	  case ELT_SUB_FAM_EVT_EVEN:
-	  case ELT_SUB_INDIV_ATTR:
-	  case ELT_SUB_INDIV_RESI:
-	  case ELT_SUB_INDIV_BIRT:
-	  case ELT_SUB_INDIV_GEN:
-	  case ELT_SUB_INDIV_ADOP:
-	  case ELT_SUB_INDIV_EVEN:
-	    event_add_note(ctxt, note); break;
-	  case ELT_SUB_SOUR:
-	    citation_add_note(ctxt, note); break;
-	  case ELT_SUB_MULTIM_OBJE:
-	    multimedia_link_add_note(ctxt, note); break;
-	  case ELT_SUB_LSS_SLGS:
-	  case ELT_SUB_LIO_BAPL:
-	  case ELT_SUB_LIO_SLGC:
-	    lds_event_add_note(ctxt, note); break;
-	  case REC_FAM:
-	    family_add_note(ctxt, note); break;
-	  case ELT_SUB_CHAN:
-	    change_date_add_note(ctxt, note); break;
-	  case ELT_SUB_PERS_NAME:
-	    name_add_note(ctxt, note); break;
-	  case ELT_SUB_FAMC: 
-	  case ELT_SUB_FAMS:
-	    family_link_add_note(ctxt, note); break;
-	  case ELT_SUB_ASSO:
-	    association_add_note(ctxt, note); break;
-	  case REC_INDI:
-	    individual_add_note(ctxt, note); break;
-	  case REC_OBJE:
-	    multimedia_add_note(ctxt, note); break;
-	  case REC_REPO:
-	    repository_add_note(ctxt, note); break;
-	  case ELT_SOUR_DATA:
-	    source_add_note_to_data(ctxt, note); break;
-	  case ELT_SUB_REPO:
-	    source_add_note_to_repo(ctxt, note); break;
-	  case REC_SOUR:
-	    source_add_note(ctxt, note); break;
-	  default:
-	    UNEXPECTED_CONTEXT(ctxt->ctxt_type);
-	}
-	result = MAKE_GOM_CTXT(elt, note_sub, note);
+      switch (type) {
+	case ELT_SUB_PLAC:
+	  ADDFUNC2(place,note_sub)(ctxt, note); break;
+	case ELT_SUB_FAM_EVT:
+	case ELT_SUB_FAM_EVT_EVEN:
+	case ELT_SUB_INDIV_ATTR:
+	case ELT_SUB_INDIV_RESI:
+	case ELT_SUB_INDIV_BIRT:
+	case ELT_SUB_INDIV_GEN:
+	case ELT_SUB_INDIV_ADOP:
+	case ELT_SUB_INDIV_EVEN:
+	  ADDFUNC2(event,note_sub)(ctxt, note); break;
+	case ELT_SUB_SOUR:
+	  ADDFUNC2(source_citation,note_sub)(ctxt, note); break;
+	case ELT_SUB_MULTIM_OBJE:
+	  ADDFUNC2(multimedia_link,note_sub)(ctxt, note); break;
+	case ELT_SUB_LSS_SLGS:
+	case ELT_SUB_LIO_BAPL:
+	case ELT_SUB_LIO_SLGC:
+	  ADDFUNC2(lds_event,note_sub)(ctxt, note); break;
+	case REC_FAM:
+	  ADDFUNC2(family,note_sub)(ctxt, note); break;
+	case ELT_SUB_CHAN:
+	  ADDFUNC2(change_date,note_sub)(ctxt, note); break;
+	case ELT_SUB_PERS_NAME:
+	  ADDFUNC2(personal_name,note_sub)(ctxt, note); break;
+	case ELT_SUB_FAMC: 
+	case ELT_SUB_FAMS:
+	  ADDFUNC2(family_link,note_sub)(ctxt, note); break;
+	case ELT_SUB_ASSO:
+	  ADDFUNC2(association,note_sub)(ctxt, note); break;
+	case REC_INDI:
+	  ADDFUNC2(individual,note_sub)(ctxt, note); break;
+	case REC_OBJE:
+	  ADDFUNC2(multimedia,note_sub)(ctxt, note); break;
+	case REC_REPO:
+	  ADDFUNC2(repository,note_sub)(ctxt, note); break;
+	case ELT_SOUR_DATA:
+	  source_add_note_to_data(ctxt, note); break;
+	case ELT_SUB_REPO:
+	  source_add_note_to_repo(ctxt, note); break;
+	case REC_SOUR:
+	  ADDFUNC2(source,note_sub)(ctxt, note); break;
+	default:
+	  UNEXPECTED_CONTEXT(type);
       }
+      result = MAKE_GOM_CTXT(elt, note_sub, note);
     }
   }
 
   return (Gedcom_ctxt)result;
 }
 
-void note_sub_subscribe()
+void sub_note_end(_ELT_END_PARAMS_)
 {
-  gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, def_elt_end);
+  if (GEDCOM_IS_STRING(parsed_value)) {
+    Gom_ctxt ctxt = (Gom_ctxt)self;
+    if (! ctxt)
+      NO_CONTEXT;
+    else {
+      struct note_sub *obj = SAFE_CTXT_CAST(note_sub, ctxt);
+      if (obj) {
+	char *str = GEDCOM_STRING(parsed_value);
+	char *newvalue = strdup(str);
+	if (! newvalue)
+	  MEMORY_ERROR;
+	else
+	  obj->text = newvalue;
+      }
+      def_elt_end(elt, parent, self, parsed_value);
+    }
+  }
 }
 
-void note_sub_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
+DEFINE_SUB_MAKEFUNC(note_sub)
+DEFINE_SUB_ADDFUNC(note_sub)
+DEFINE_SUB_FINDFUNC(note_sub)
+DEFINE_SUB_REMOVEFUNC(note_sub)
+DEFINE_SUB_MOVEFUNC(note_sub)
+     
+DEFINE_ADDFUNC2(note_sub, source_citation, citation)
+DEFINE_ADDFUNC2(note_sub, user_data, extra)
+     
+void note_sub_subscribe()
 {
-  struct note_sub *note = SAFE_CTXT_CAST(note_sub, ctxt);
-  if (note)
-    LINK_CHAIN_ELT(source_citation, note->citation, cit);    
+  gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, sub_note_end);
 }
 
-void note_sub_add_to_note(NL_TYPE type, Gom_ctxt ctxt, const char* str)
+void UNREFALLFUNC(note_sub)(struct note_sub* obj)
 {
-  struct note_sub *note = SAFE_CTXT_CAST(note_sub, ctxt);
-  if (note) {
-    char *newvalue = concat_strings (type, note->text, str);
-    if (newvalue)
-      note->text = newvalue;
-    else
-      MEMORY_ERROR;
+  if (obj) {
+    struct note_sub* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->reference);
+      UNREFALLFUNC(source_citation)(runner->citation);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
   }
 }
 
-void note_sub_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void CLEANFUNC(note_sub)(struct note_sub* note)
 {
-  struct note_sub *obj = SAFE_CTXT_CAST(note_sub, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);;
+  if (note) {
+    SAFE_FREE(note->text);
+    DESTROY_CHAIN_ELTS(source_citation, note->citation);
+    DESTROY_CHAIN_ELTS(user_data, note->extra);
+  }
 }
 
-void note_sub_cleanup(struct note_sub* note)
+int write_note_subs(Gedcom_write_hndl hndl, int parent, struct note_sub* note)
 {
-  if (note) {
-    SAFE_FREE(note->text);
-    DESTROY_CHAIN_ELTS(source_citation, note->citation, citation_cleanup);
-    DESTROY_CHAIN_ELTS(user_data, note->extra, user_data_cleanup);
+  int result = 0;
+  struct note_sub* obj;
+
+  if (!note) return 1;
+
+  for (obj = note; obj; obj = obj->next) {
+    if (obj->reference) {
+      result |= gedcom_write_element_xref(hndl, ELT_SUB_NOTE, 0,
+					  parent, obj->reference);
+    }
+    else {
+      result |= gedcom_write_element_str(hndl, ELT_SUB_NOTE, 0,
+					 parent, obj->text);
+    }
+    if (obj->citation)
+      result |= write_citations(hndl, ELT_SUB_NOTE, obj->citation);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);
   }
+
+  return result;
 }