void gedcom_set_default_callback(Gedcom_def_cb func)
{
+ if (default_cb)
+ gedcom_error(_("Internal error: Duplicate registration for default callback"));
default_cb = func;
}
Gedcom_rec_start_cb cb_start,
Gedcom_rec_end_cb cb_end)
{
+ if (record_start_callback[rec] || record_end_callback[rec])
+ gedcom_error(_("Internal error: Duplicate registration for record type %d"), rec);
if (cb_start) {
record_start_callback[rec] = cb_start;
record_end_callback[rec] = cb_end;
Gedcom_elt_start_cb cb_start,
Gedcom_elt_end_cb cb_end)
{
+ if (element_start_callback[elt] || element_end_callback[elt])
+ gedcom_error(_("Internal error: Duplicate registration for element type %d"), elt);
if (cb_start) {
element_start_callback[elt] = cb_start;
element_end_callback[elt] = cb_end;
{
Gedcom_rec_start_cb cb = record_start_callback[rec];
if (cb != NULL)
- return (*cb)(level, xref, tag.string, raw_value, tag.value, parsed_value);
+ return (*cb)(rec, level, xref, tag.string, raw_value, tag.value,
+ parsed_value);
else
return NULL;
}
-void end_record(Gedcom_rec rec, Gedcom_ctxt self)
+void end_record(Gedcom_rec rec, Gedcom_ctxt self, Gedcom_val parsed_value)
{
Gedcom_rec_end_cb cb = record_end_callback[rec];
if (cb != NULL)
- (*cb)(self);
+ (*cb)(rec, self, parsed_value);
}
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
Gedcom_elt_start_cb cb = element_start_callback[elt];
Gedcom_ctxt ctxt = parent;
if (cb != NULL)
- ctxt = (*cb)(parent, level, tag.string, raw_value,
+ ctxt = (*cb)(elt, 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);
+ (*default_cb)(elt, parent, level, tag.string, raw_value, tag.value);
return ctxt;
}
{
Gedcom_elt_end_cb cb = element_end_callback[elt];
if (cb != NULL)
- (*cb)(parent, self, parsed_value);
+ (*cb)(elt, parent, self, parsed_value);
}
-char* val_type_str[] = { N_("null value"),
- N_("character string"),
- N_("date"),
- N_("cross-reference") };
+const char* val_type_str[] = { N_("null value"),
+ N_("character string"),
+ N_("date"),
+ N_("cross-reference") };
-void gedcom_cast_error(char* file, int line,
+void gedcom_cast_error(const char* file, int line,
Gedcom_val_type tried_type,
Gedcom_val_type real_type)
{