X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=standalone.c;h=9c8dc15d2130188daf58d18bc945fa2b93036af0;hb=0e044d1efe3ed730e8f0bd20361b27059c6ca7d5;hp=863da53e256aba71f975dac0b4cb49f2a16603bd;hpb=77989125b676e463aa052e0fd22f5bcb98d0ff77;p=gedcom-parse.git diff --git a/standalone.c b/standalone.c index 863da53..9c8dc15 100644 --- a/standalone.c +++ b/standalone.c @@ -1,5 +1,5 @@ /* 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 , 2001. @@ -25,7 +25,10 @@ #include #include #include +#include +#include #include "gedcom.h" +#include "utf8-locale.h" #define OUTFILE "testgedcom.out" FILE* outfile = NULL; @@ -59,10 +62,12 @@ void show_help () printf(" -3 Run the test parse 3 times instead of once\n"); } -Gedcom_ctxt header_start(int level, Gedcom_val xref, char *tag) +Gedcom_ctxt header_start(int level, Gedcom_val xref, char *tag, + char *raw_value, int tag_value, + Gedcom_val parsed_value) { output(1, "Header start\n"); - return (Gedcom_ctxt)0; + return (Gedcom_ctxt)1; } void header_end(Gedcom_ctxt self) @@ -71,28 +76,56 @@ void header_end(Gedcom_ctxt self) } char family_xreftags[100][255]; -int family_nr = 0; +int family_nr = 1; -Gedcom_ctxt family_start(int level, Gedcom_val xref, char *tag) +Gedcom_ctxt family_start(int level, Gedcom_val xref, char *tag, + char *raw_value, int tag_value, + Gedcom_val parsed_value) { - output(1, "Family start, xref is %s\n", GEDCOM_STRING(xref)); - strcpy(family_xreftags[family_nr], GEDCOM_STRING(xref)); + struct xref_value *xr = GEDCOM_XREF_PTR(xref); + output(1, "Family start, xref is %s\n", xr->string); + strcpy(family_xreftags[family_nr], xr->string); + xr->object = (Gedcom_ctxt)family_nr; return (Gedcom_ctxt)(family_nr++); } +Gedcom_ctxt rec_start(int level, Gedcom_val xref, char *tag, + char *raw_value, int tag_value, + Gedcom_val parsed_value) +{ + char* xref_str = NULL; + if (! GEDCOM_IS_NULL(xref)) + xref_str = GEDCOM_XREF_PTR(xref)->string; + output(1, "Rec %s start, xref is %s\n", tag, xref_str); + return (Gedcom_ctxt)tag_value; +} + +Gedcom_ctxt note_start(int level, Gedcom_val xref, char *tag, + char *raw_value, int tag_value, + Gedcom_val parsed_value) +{ + output(1, "== %d %s (%d) %s (xref is %s)\n", + level, tag, tag_value, GEDCOM_STRING(parsed_value), + GEDCOM_XREF_PTR(xref)->string); + return (Gedcom_ctxt)tag_value; +} + void family_end(Gedcom_ctxt self) { output(1, "Family end, xref is %s\n", family_xreftags[(int)self]); } -Gedcom_ctxt submit_start(int level, Gedcom_val xref, char *tag) +Gedcom_ctxt submit_start(int level, Gedcom_val xref, char *tag, + char *raw_value, int tag_value, + Gedcom_val parsed_value) { - output(1, "Submitter, xref is %s\n", GEDCOM_STRING(xref)); + output(1, "Submitter, xref is %s\n", GEDCOM_XREF_PTR(xref)->string); 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", @@ -106,7 +139,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, - 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); @@ -134,16 +168,28 @@ Gedcom_ctxt source_date_start(Gedcom_ctxt parent, int level, char *tag, 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); + char *converted = NULL; + if (raw_value) + converted = convert_utf8_to_locale(raw_value); + output(0, "== %d %s (%d) %s (ctxt is %d)\n", + level, tag, tag_value, converted, (int)ctxt); } void subscribe_callbacks() { gedcom_subscribe_to_record(REC_HEAD, header_start, header_end); gedcom_subscribe_to_record(REC_FAM, family_start, family_end); + gedcom_subscribe_to_record(REC_INDI, rec_start, NULL); + gedcom_subscribe_to_record(REC_OBJE, rec_start, NULL); + gedcom_subscribe_to_record(REC_NOTE, note_start, NULL); + gedcom_subscribe_to_record(REC_REPO, rec_start, NULL); + gedcom_subscribe_to_record(REC_SOUR, rec_start, NULL); + gedcom_subscribe_to_record(REC_SUBN, rec_start, NULL); gedcom_subscribe_to_record(REC_SUBM, submit_start, NULL); + gedcom_subscribe_to_record(REC_USER, rec_start, NULL); gedcom_subscribe_to_element(ELT_HEAD_SOUR, source_start, source_end); gedcom_subscribe_to_element(ELT_SOUR_DATA_EVEN_DATE, source_date_start, NULL); @@ -152,12 +198,12 @@ void subscribe_callbacks() void gedcom_message_handler(Gedcom_msg_type type, char *msg) { if (type == MESSAGE) - fprintf(stderr, "MESSAGE: "); + output(1, "MESSAGE: "); else if (type == WARNING) - fprintf(stderr, "WARNING: "); + output(1, "WARNING: "); else if (type == ERROR) - fprintf(stderr, "ERROR: "); - fprintf(stderr, "%s\n", msg); + output(1, "ERROR: "); + output(1, "%s\n", msg); } int main(int argc, char* argv[]) @@ -212,6 +258,7 @@ int main(int argc, char* argv[]) exit(1); } + setlocale(LC_ALL, ""); gedcom_set_debug_level(debug_level, NULL); gedcom_set_compat_handling(compat_enabled); gedcom_set_error_handling(mech);