X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=74d2e9190931698c9a2a87742cd891a3b0d73591;hb=44bfd161d5274ff6a39f3640d745b9bbabe715ad;hp=58604442e4671c4533ce32c228775913a21f1f7c;hpb=e33cdc26ace551aae08fcd71a9f0d460c89b789d;p=gedcom-parse.git diff --git a/gedcom/interface.c b/gedcom/interface.c index 5860444..74d2e91 100644 --- a/gedcom/interface.c +++ b/gedcom/interface.c @@ -1,5 +1,5 @@ /* Implementation of the interface to applications. - Copyright (C) 2001 The Genes Development Team + Copyright (C) 2001, 2002 The Genes Development Team This file is part of the Gedcom parser library. Contributed by Peter Verthez , 2001. @@ -56,11 +56,12 @@ void gedcom_subscribe_to_element(Gedcom_elt elt, } Gedcom_ctxt start_record(Gedcom_rec rec, - int level, Gedcom_val xref, char *tag) + int level, Gedcom_val xref, struct tag_struct tag, + char *raw_value, Gedcom_val parsed_value) { Gedcom_rec_start_cb cb = record_start_callback[rec]; if (cb != NULL) - return (*cb)(level, xref, tag); + return (*cb)(level, xref, tag.string, raw_value, tag.value, parsed_value); else return NULL; } @@ -73,15 +74,16 @@ void end_record(Gedcom_rec rec, Gedcom_ctxt self) } Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent, - int level, char *tag, char *raw_value, + int level, struct tag_struct tag, char *raw_value, Gedcom_val parsed_value) { Gedcom_elt_start_cb cb = element_start_callback[elt]; Gedcom_ctxt ctxt = parent; if (cb != NULL) - ctxt = (*cb)(parent, level, tag, raw_value, parsed_value); - else if (default_cb != NULL) - (*default_cb)(parent, level, tag, raw_value); + ctxt = (*cb)(parent, level, tag.string, raw_value, + tag.value, parsed_value); + else if (default_cb != NULL && parent != NULL) + (*default_cb)(parent, level, tag.string, raw_value, tag.value); return ctxt; } @@ -95,7 +97,8 @@ void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self, char* val_type_str[] = { N_("null value"), N_("character string"), - N_("date") }; + N_("date"), + N_("cross-reference") }; void gedcom_cast_error(char* file, int line, Gedcom_val_type tried_type,