X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=74d2e9190931698c9a2a87742cd891a3b0d73591;hb=a9ef3e45e68f855ec594bd5f1fa5e25618a706fd;hp=8a69ffed288db983459cbb00649c178a5dbfcd4d;hpb=8c92a223c34fbd674f26520fb990c64a7b2f9147;p=gedcom-parse.git diff --git a/gedcom/interface.c b/gedcom/interface.c index 8a69ffe..74d2e91 100644 --- a/gedcom/interface.c +++ b/gedcom/interface.c @@ -56,11 +56,12 @@ void gedcom_subscribe_to_element(Gedcom_elt elt, } Gedcom_ctxt start_record(Gedcom_rec rec, - int level, Gedcom_val xref, struct tag_struct 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.string, tag.value); + return (*cb)(level, xref, tag.string, raw_value, tag.value, parsed_value); else return NULL; } @@ -81,7 +82,7 @@ Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent, if (cb != NULL) ctxt = (*cb)(parent, level, tag.string, raw_value, tag.value, parsed_value); - else if (default_cb != NULL) + else if (default_cb != NULL && parent != NULL) (*default_cb)(parent, level, tag.string, raw_value, tag.value); return ctxt; } @@ -96,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,