X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=standalone.c;h=75b662cecac7b6d47d773b961f6efb532c165eb3;hb=465e8c27883cb6e9c4df526e91da9c7bc1a7b506;hp=524dfac87a55055cd786fb387f8a5903e25c326b;hpb=8c92a223c34fbd674f26520fb990c64a7b2f9147;p=gedcom-parse.git diff --git a/standalone.c b/standalone.c index 524dfac..75b662c 100644 --- a/standalone.c +++ b/standalone.c @@ -25,10 +25,15 @@ #include #include #include +#include +#include +#include #include "gedcom.h" +#include "utf8-locale.h" #define OUTFILE "testgedcom.out" FILE* outfile = NULL; +int quiet = 0; void output(int to_stdout_too, char* format, ...) { @@ -37,7 +42,7 @@ void output(int to_stdout_too, char* format, ...) if (outfile) { vfprintf(outfile, format, ap); } - if (to_stdout_too) { + if (to_stdout_too && !quiet) { vprintf(format, ap); } va_end(ap); @@ -57,12 +62,15 @@ void show_help () printf(" -da Debug setting: libgedcom + yacc debug messages\n"); printf(" -2 Run the test parse 2 times instead of once\n"); printf(" -3 Run the test parse 3 times instead of once\n"); + printf(" -q No output to standard output\n"); } -Gedcom_ctxt header_start(int level, Gedcom_val xref, char *tag, int tag_value) +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,23 +79,50 @@ 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, int tag_value) +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, int tag_value) +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; } @@ -139,15 +174,26 @@ Gedcom_ctxt source_date_start(Gedcom_ctxt parent, int level, char *tag, void default_cb(Gedcom_ctxt ctxt, int level, char *tag, char *raw_value, int tag_value) { - output(0, "== %d %s (%d) %s (ctxt is %d)\n", - level, tag, tag_value, raw_value, (int)ctxt); + char *converted = NULL; + int conv_fails = 0; + if (raw_value) + converted = convert_utf8_to_locale(raw_value, &conv_fails); + output(0, "== %d %s (%d) %s (ctxt is %d, conversion failures: %d)\n", + level, tag, tag_value, converted, (int)ctxt, conv_fails); } 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); @@ -156,12 +202,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[]) @@ -198,6 +244,9 @@ int main(int argc, char* argv[]) else if (!strncmp(argv[i], "-3", 3)) { run_times = 3; } + else if (!strncmp(argv[i], "-q", 3)) { + quiet = 1; + } else if (strncmp(argv[i], "-", 1)) { file_name = argv[i]; break; @@ -216,6 +265,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); @@ -233,11 +283,11 @@ int main(int argc, char* argv[]) } fclose(outfile); if (result == 0) { - printf("Parse succeeded\n"); + output(1, "Parse succeeded\n"); return 0; } else { - printf("Parse failed\n"); + output(1, "Parse failed\n"); return 1; } }