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
Pass the parsed tag value (integer format) together with the string value
[gedcom-parse.git]
/
standalone.c
diff --git
a/standalone.c
b/standalone.c
index 55948cda6b1a6422db582a7297fc0408958bfcdd..524dfac87a55055cd786fb387f8a5903e25c326b 100644
(file)
--- a/
standalone.c
+++ b/
standalone.c
@@
-1,5
+1,5
@@
/* Test program for the Gedcom library.
/* Test program for the Gedcom library.
- 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.
@@
-59,7
+59,7
@@
void show_help ()
printf(" -3 Run the test parse 3 times instead of once\n");
}
printf(" -3 Run the test parse 3 times instead of once\n");
}
-Gedcom_ctxt header_start(int level,
char *xref, char *tag
)
+Gedcom_ctxt header_start(int level,
Gedcom_val xref, char *tag, int tag_value
)
{
output(1, "Header start\n");
return (Gedcom_ctxt)0;
{
output(1, "Header start\n");
return (Gedcom_ctxt)0;
@@
-73,10
+73,10
@@
void header_end(Gedcom_ctxt self)
char family_xreftags[100][255];
int family_nr = 0;
char family_xreftags[100][255];
int family_nr = 0;
-Gedcom_ctxt family_start(int level,
char *xref, char *tag
)
+Gedcom_ctxt family_start(int level,
Gedcom_val xref, char *tag, int tag_value
)
{
{
- output(1, "Family start, xref is %s\n",
xref
);
- strcpy(family_xreftags[family_nr],
xref
);
+ output(1, "Family start, xref is %s\n",
GEDCOM_STRING(xref)
);
+ strcpy(family_xreftags[family_nr],
GEDCOM_STRING(xref)
);
return (Gedcom_ctxt)(family_nr++);
}
return (Gedcom_ctxt)(family_nr++);
}
@@
-85,14
+85,15
@@
void family_end(Gedcom_ctxt self)
output(1, "Family end, xref is %s\n", family_xreftags[(int)self]);
}
output(1, "Family end, xref is %s\n", family_xreftags[(int)self]);
}
-Gedcom_ctxt submit_start(int level,
char *xref, char *tag
)
+Gedcom_ctxt submit_start(int level,
Gedcom_val xref, char *tag, int tag_value
)
{
{
- output(1, "Submitter, xref is %s\n",
xref
);
+ output(1, "Submitter, xref is %s\n",
GEDCOM_STRING(xref)
);
return (Gedcom_ctxt)10000;
}
Gedcom_ctxt source_start(Gedcom_ctxt parent, int level, char *tag,
return (Gedcom_ctxt)10000;
}
Gedcom_ctxt source_start(Gedcom_ctxt parent, int level, char *tag,
- char* raw_value, Gedcom_val parsed_value)
+ char* raw_value,
+ int tag_value, Gedcom_val parsed_value)
{
Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000);
output(1, "Source is %s (ctxt is %d, parent is %d)\n",
{
Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000);
output(1, "Source is %s (ctxt is %d, parent is %d)\n",
@@
-106,7
+107,8
@@
void source_end(Gedcom_ctxt parent, Gedcom_ctxt self, Gedcom_val parsed_value)
}
Gedcom_ctxt source_date_start(Gedcom_ctxt parent, int level, char *tag,
}
Gedcom_ctxt source_date_start(Gedcom_ctxt parent, int level, char *tag,
- char* raw_value, Gedcom_val parsed_value)
+ char* raw_value,
+ int tag_value, Gedcom_val parsed_value)
{
struct date_value dv;
Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000);
{
struct date_value dv;
Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000);
@@
-134,9
+136,11
@@
Gedcom_ctxt source_date_start(Gedcom_ctxt parent, int level, char *tag,
return self;
}
return self;
}
-void default_cb(Gedcom_ctxt ctxt, int level, char *tag, char *raw_value)
+void default_cb(Gedcom_ctxt ctxt, int level, char *tag, char *raw_value,
+ int tag_value)
{
{
- output(0, "== %d %s %s (ctxt is %d)\n", level, tag, raw_value, (int)ctxt);
+ output(0, "== %d %s (%d) %s (ctxt is %d)\n",
+ level, tag, tag_value, raw_value, (int)ctxt);
}
void subscribe_callbacks()
}
void subscribe_callbacks()
@@
-157,7
+161,7
@@
void gedcom_message_handler(Gedcom_msg_type type, char *msg)
fprintf(stderr, "WARNING: ");
else if (type == ERROR)
fprintf(stderr, "ERROR: ");
fprintf(stderr, "WARNING: ");
else if (type == ERROR)
fprintf(stderr, "ERROR: ");
- fprintf(stderr, msg);
+ fprintf(stderr,
"%s\n",
msg);
}
int main(int argc, char* argv[])
}
int main(int argc, char* argv[])