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
Allow elements out of context in GOM.
[gedcom-parse.git]
/
gom
/
user_ref.c
diff --git
a/gom/user_ref.c
b/gom/user_ref.c
index 77b2b7d1ea32c6aaefed1497f32a49adcd753ae2..c43874f829d2561d277540d4fc30ccef28774ec9 100644
(file)
--- a/
gom/user_ref.c
+++ b/
gom/user_ref.c
@@
-43,20
+43,16
@@
Gedcom_ctxt sub_user_ref_start(_ELT_PARAMS_)
if (! ctxt)
NO_CONTEXT;
else {
if (! ctxt)
NO_CONTEXT;
else {
- struct user_ref_number *refn
- = (struct user_ref_number *)malloc(sizeof(struct user_ref_number));
-
- if (! refn)
- MEMORY_ERROR;
- else {
- memset (refn, 0, sizeof(struct user_ref_number));
+ struct user_ref_number *refn = SUB_MAKEFUNC(user_ref_number)();
+ if (refn) {
refn->value = strdup(GEDCOM_STRING(parsed_value));
if (! refn->value) {
MEMORY_ERROR;
free(refn);
}
else {
refn->value = strdup(GEDCOM_STRING(parsed_value));
if (! refn->value) {
MEMORY_ERROR;
free(refn);
}
else {
- switch (ctxt->ctxt_type) {
+ int type = ctxt_type(ctxt);
+ switch (type) {
case REC_FAM:
ADDFUNC2(family,user_ref_number)(ctxt, refn); break;
case REC_INDI:
case REC_FAM:
ADDFUNC2(family,user_ref_number)(ctxt, refn); break;
case REC_INDI:
@@
-70,7
+66,7
@@
Gedcom_ctxt sub_user_ref_start(_ELT_PARAMS_)
case REC_SOUR:
ADDFUNC2(source,user_ref_number)(ctxt, refn); break;
default:
case REC_SOUR:
ADDFUNC2(source,user_ref_number)(ctxt, refn); break;
default:
- UNEXPECTED_CONTEXT(
ctxt->ctxt_
type);
+ UNEXPECTED_CONTEXT(type);
}
result = MAKE_GOM_CTXT(elt, user_ref_number, refn);
}
result = MAKE_GOM_CTXT(elt, user_ref_number, refn);
@@
-81,6
+77,12
@@
Gedcom_ctxt sub_user_ref_start(_ELT_PARAMS_)
return (Gedcom_ctxt)result;
}
return (Gedcom_ctxt)result;
}
+DEFINE_SUB_MAKEFUNC(user_ref_number)
+DEFINE_SUB_ADDFUNC(user_ref_number)
+DEFINE_SUB_FINDFUNC(user_ref_number)
+DEFINE_SUB_REMOVEFUNC(user_ref_number)
+DEFINE_SUB_MOVEFUNC(user_ref_number)
+
DEFINE_STRING_CB(user_ref_number, sub_user_ref_type_start, type)
DEFINE_ADDFUNC2(user_ref_number, user_data, extra)
DEFINE_STRING_CB(user_ref_number, sub_user_ref_type_start, type)
DEFINE_ADDFUNC2(user_ref_number, user_data, extra)
@@
-94,8
+96,9
@@
Gedcom_ctxt sub_user_rin_start(_ELT_PARAMS_)
NO_CONTEXT;
else {
char *str = GEDCOM_STRING(parsed_value);
NO_CONTEXT;
else {
char *str = GEDCOM_STRING(parsed_value);
+ int type = ctxt_type(ctxt);
- switch (
ctxt->ctxt_
type) {
+ switch (type) {
case REC_FAM:
ADDFUNC2_STR(family,record_id)(ctxt, str); break;
case REC_INDI:
case REC_FAM:
ADDFUNC2_STR(family,record_id)(ctxt, str); break;
case REC_INDI:
@@
-109,9
+112,9
@@
Gedcom_ctxt sub_user_rin_start(_ELT_PARAMS_)
case REC_SOUR:
ADDFUNC2_STR(source,record_id)(ctxt, str); break;
default:
case REC_SOUR:
ADDFUNC2_STR(source,record_id)(ctxt, str); break;
default:
- UNEXPECTED_CONTEXT(
ctxt->ctxt_
type);
+ UNEXPECTED_CONTEXT(type);
}
}
- result =
make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr
);
+ result =
dup_gom_ctxt(ctxt, elt
);
}
return (Gedcom_ctxt)result;
}
}
return (Gedcom_ctxt)result;
}
@@
-126,6
+129,15
@@
void user_ref_subscribe()
def_elt_end);
}
def_elt_end);
}
+void UNREFALLFUNC(user_ref_number)(struct user_ref_number* obj)
+{
+ if (obj) {
+ struct user_ref_number* runner;
+ for (runner = obj; runner; runner = runner->next)
+ UNREFALLFUNC(user_data)(runner->extra);
+ }
+}
+
void CLEANFUNC(user_ref_number)(struct user_ref_number* refn)
{
if (refn) {
void CLEANFUNC(user_ref_number)(struct user_ref_number* refn)
{
if (refn) {