X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fsource_citation.c;h=406972a7b57a5df92eceee4765bb2e44fe8b2f7f;hb=866835ac8928d7e40919c2ca59799cb37023856f;hp=17c2b6dcb2d1b19ff08e47a1f70ce192db4c89c5;hpb=1568cb8ab16ecc1984d0d00b8ae8189c32508b08;p=gedcom-parse.git diff --git a/gom/source_citation.c b/gom/source_citation.c index 17c2b6d..406972a 100644 --- a/gom/source_citation.c +++ b/gom/source_citation.c @@ -47,19 +47,15 @@ Gedcom_ctxt sub_citation_start(_ELT_PARAMS_) if (! ctxt) NO_CONTEXT; else { - struct source_citation *cit - = (struct source_citation *)malloc(sizeof(struct source_citation)); - - if (! cit) - MEMORY_ERROR; - else { - memset (cit, 0, sizeof(struct source_citation)); + struct source_citation *cit = SUB_MAKEFUNC(source_citation)(); + if (cit) { + int type = ctxt_type(ctxt); if (GEDCOM_IS_XREF_PTR(parsed_value)) cit->reference = GEDCOM_XREF_PTR(parsed_value); - switch (ctxt->ctxt_type) { + switch (type) { case ELT_SUB_PLAC: - place_add_citation(ctxt, cit); break; + ADDFUNC2(place,source_citation)(ctxt, cit); break; case ELT_SUB_FAM_EVT: case ELT_SUB_FAM_EVT_EVEN: case ELT_SUB_INDIV_ATTR: @@ -68,25 +64,25 @@ Gedcom_ctxt sub_citation_start(_ELT_PARAMS_) case ELT_SUB_INDIV_GEN: case ELT_SUB_INDIV_ADOP: case ELT_SUB_INDIV_EVEN: - event_add_citation(ctxt, cit); break; + ADDFUNC2(event,source_citation)(ctxt, cit); break; case ELT_SUB_NOTE: - note_sub_add_citation(ctxt, cit); break; + ADDFUNC2(note_sub,source_citation)(ctxt, cit); break; case ELT_SUB_LSS_SLGS: case ELT_SUB_LIO_BAPL: case ELT_SUB_LIO_SLGC: - lds_event_add_citation(ctxt, cit); break; + ADDFUNC2(lds_event,source_citation)(ctxt, cit); break; case REC_FAM: - family_add_citation(ctxt, cit); break; + ADDFUNC2(family,source_citation)(ctxt, cit); break; case ELT_SUB_PERS_NAME: - name_add_citation(ctxt, cit); break; + ADDFUNC2(personal_name,source_citation)(ctxt, cit); break; case REC_INDI: - individual_add_citation(ctxt, cit); break; + ADDFUNC2(individual,source_citation)(ctxt, cit); break; case ELT_SUB_ASSO: - association_add_citation(ctxt, cit); break; + ADDFUNC2(association,source_citation)(ctxt, cit); break; case REC_NOTE: - note_add_citation(ctxt, cit); break; + ADDFUNC2(note,source_citation)(ctxt, cit); break; default: - UNEXPECTED_CONTEXT(ctxt->ctxt_type); + UNEXPECTED_CONTEXT(type); } result = MAKE_GOM_CTXT(elt, source_citation, cit); } @@ -113,7 +109,7 @@ void sub_citation_end(_ELT_END_PARAMS_) cit->description = newvalue; } } - destroy_gom_ctxt(ctxt); + def_elt_end(elt, parent, self, parsed_value); } } @@ -137,13 +133,23 @@ Gedcom_ctxt sub_cit_text_start(_ELT_PARAMS_) return (Gedcom_ctxt)result; } -STRING_CB(source_citation, sub_cit_page_start, page) -STRING_CB(source_citation, sub_cit_even_start, event) -STRING_CB(source_citation, sub_cit_even_role_start, role) -NULL_CB(source_citation, sub_cit_data_start) -DATE_CB(source_citation, sub_cit_data_date_start, date) -STRING_CB(source_citation, sub_cit_quay_start, quality) -STRING_END_CB(text, sub_cit_text_end, text) +DEFINE_SUB_MAKEFUNC(source_citation) +DEFINE_SUB_ADDFUNC(source_citation) +DEFINE_SUB_FINDFUNC(source_citation) +DEFINE_SUB_REMOVEFUNC(source_citation) +DEFINE_SUB_MOVEFUNC(source_citation) + +DEFINE_STRING_CB(source_citation, sub_cit_page_start, page) +DEFINE_STRING_CB(source_citation, sub_cit_even_start, event) +DEFINE_STRING_CB(source_citation, sub_cit_even_role_start, role) +DEFINE_NULL_CB(source_citation, sub_cit_data_start) +DEFINE_DATE_CB(source_citation, sub_cit_data_date_start, date) +DEFINE_STRING_CB(source_citation, sub_cit_quay_start, quality) +DEFINE_STRING_END_CB(text, sub_cit_text_end, text) + +DEFINE_ADDFUNC2(source_citation, note_sub, note) +DEFINE_ADDFUNC2(source_citation, multimedia_link, mm_link) +DEFINE_ADDFUNC2(source_citation, user_data, extra) void citation_subscribe() { @@ -165,35 +171,43 @@ void citation_subscribe() def_elt_end); } -void citation_add_note(Gom_ctxt ctxt, struct note_sub* note) -{ - struct source_citation *cit = SAFE_CTXT_CAST(source_citation, ctxt); - if (cit) - LINK_CHAIN_ELT(note_sub, cit->note, note); -} - -void citation_add_mm_link(Gom_ctxt ctxt, struct multimedia_link* mm) +void UNREFALLFUNC(text)(struct text* obj) { - struct source_citation *cit = SAFE_CTXT_CAST(source_citation, ctxt); - if (cit) - LINK_CHAIN_ELT(multimedia_link, cit->mm_link, mm); + if (obj) { + struct text* runner; + for (runner = obj; runner; runner = runner->next) + UNREFALLFUNC(user_data)(runner->extra); + } } -void citation_add_user_data(Gom_ctxt ctxt, struct user_data* data) +void CLEANFUNC(text)(struct text* t) { - struct source_citation *obj = SAFE_CTXT_CAST(source_citation, ctxt); - if (obj) - LINK_CHAIN_ELT(user_data, obj->extra, data); + if (t) { + SAFE_FREE(t->text); + } } -void text_cleanup(struct text* t) +DEFINE_SUB_MAKEFUNC(text) +DEFINE_SUB_ADDFUNC(text) +DEFINE_SUB_FINDFUNC(text) +DEFINE_SUB_REMOVEFUNC(text) +DEFINE_SUB_MOVEFUNC(text) + +void UNREFALLFUNC(source_citation)(struct source_citation* obj) { - if (t) { - SAFE_FREE(t->text); + if (obj) { + struct source_citation* runner; + for (runner = obj; runner; runner = runner->next) { + unref_xref_value(runner->reference); + UNREFALLFUNC(text)(runner->text); + UNREFALLFUNC(multimedia_link)(runner->mm_link); + UNREFALLFUNC(note_sub)(runner->note); + UNREFALLFUNC(user_data)(runner->extra); + } } } -void citation_cleanup(struct source_citation* cit) +void CLEANFUNC(source_citation)(struct source_citation* cit) { if (cit) { SAFE_FREE(cit->description); @@ -201,11 +215,11 @@ void citation_cleanup(struct source_citation* cit) SAFE_FREE(cit->event); SAFE_FREE(cit->role); SAFE_FREE(cit->date); - DESTROY_CHAIN_ELTS(text, cit->text, text_cleanup); + DESTROY_CHAIN_ELTS(text, cit->text); SAFE_FREE(cit->quality); - DESTROY_CHAIN_ELTS(multimedia_link, cit->mm_link, multimedia_link_cleanup); - DESTROY_CHAIN_ELTS(note_sub, cit->note, note_sub_cleanup); - DESTROY_CHAIN_ELTS(user_data, cit->extra, user_data_cleanup); + DESTROY_CHAIN_ELTS(multimedia_link, cit->mm_link); + DESTROY_CHAIN_ELTS(note_sub, cit->note); + DESTROY_CHAIN_ELTS(user_data, cit->extra); } }