dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use own colors; specifically to have white background.
[gedcom-parse.git]
/
gedcom
/
interface.c
diff --git
a/gedcom/interface.c
b/gedcom/interface.c
index 5f7ceee13c06398cf0b90d399490155ecccb8548..74d2e9190931698c9a2a87742cd891a3b0d73591 100644
(file)
--- a/
gedcom/interface.c
+++ b/
gedcom/interface.c
@@
-1,5
+1,5
@@
/* Implementation of the interface to applications.
/* 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 <Peter.Verthez@advalvas.be>, 2001.
This file is part of the Gedcom parser library.
Contributed by Peter Verthez <Peter.Verthez@advalvas.be>, 2001.
@@
-39,24
+39,29
@@
void gedcom_subscribe_to_record(Gedcom_rec rec,
Gedcom_rec_start_cb cb_start,
Gedcom_rec_end_cb cb_end)
{
Gedcom_rec_start_cb cb_start,
Gedcom_rec_end_cb cb_end)
{
- record_start_callback[rec] = cb_start;
- record_end_callback[rec] = cb_end;
+ if (cb_start) {
+ record_start_callback[rec] = cb_start;
+ record_end_callback[rec] = cb_end;
+ }
}
void gedcom_subscribe_to_element(Gedcom_elt elt,
Gedcom_elt_start_cb cb_start,
Gedcom_elt_end_cb cb_end)
{
}
void gedcom_subscribe_to_element(Gedcom_elt elt,
Gedcom_elt_start_cb cb_start,
Gedcom_elt_end_cb cb_end)
{
- element_start_callback[elt] = cb_start;
- element_end_callback[elt] = cb_end;
+ if (cb_start) {
+ element_start_callback[elt] = cb_start;
+ element_end_callback[elt] = cb_end;
+ }
}
Gedcom_ctxt start_record(Gedcom_rec rec,
}
Gedcom_ctxt start_record(Gedcom_rec rec,
- int level, char *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)
{
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;
}
else
return NULL;
}
@@
-69,15
+74,16
@@
void end_record(Gedcom_rec rec, Gedcom_ctxt self)
}
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
}
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)
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;
}
return ctxt;
}
@@
-89,7
+95,16
@@
void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
(*cb)(parent, self, parsed_value);
}
(*cb)(parent, self, parsed_value);
}
-void gedcom_cast_error(char* file, int line)
+char* val_type_str[] = { N_("null value"),
+ N_("character string"),
+ N_("date"),
+ N_("cross-reference") };
+
+void gedcom_cast_error(char* file, int line,
+ Gedcom_val_type tried_type,
+ Gedcom_val_type real_type)
{
{
- gedcom_warning(_("Wrong cast of value in file %s, at line %d"), file, line);
+ gedcom_warning
+ (_("Wrong cast of value in file %s, at line %d: %s instead of %s"),
+ file, line, _(val_type_str[tried_type]), _(val_type_str[real_type]));
}
}