From a123e1e996ed6ab9ba78009ae755f1e563609110 Mon Sep 17 00:00:00 2001 From: Peter Verthez Date: Fri, 28 Dec 2001 20:49:01 +0000 Subject: [PATCH] Changes for parsing dates. --- ChangeLog | 13 +++++++++++++ configure.in | 1 + standalone.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 112ae2f..23b439f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2001-12-28 Peter Verthez + + * gedcom_date.*, date.*: Parsing dates via a separate yacc parser. + + * gedcom/calendar/*: Calendar routines by Scott E. Lee + + * gedcom.y: Added some more callbacks (not complete yet) + +2001-12-23 Peter Verthez + + * include/gedcom.h: Add some declarations so that the external header + can be used in C++ programs. + 2001-12-22 Peter Verthez * Makefile.am, gedcom/Makefile.am: Don't link libgedcom with libintl: diff --git a/configure.in b/configure.in index 8d51ecb..03b8945 100644 --- a/configure.in +++ b/configure.in @@ -34,6 +34,7 @@ AM_GNU_GETTEXT AC_OUTPUT(Makefile gedcom/Makefile + gedcom/calendar/Makefile ansel/Makefile t/Makefile doc/Makefile diff --git a/standalone.c b/standalone.c index 86fcdae..abd54b6 100644 --- a/standalone.c +++ b/standalone.c @@ -79,7 +79,7 @@ Gedcom_ctxt source_start(Gedcom_ctxt parent, int level, char *tag, { Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000); printf("Source is %s (ctxt is %d, parent is %d)\n", - (char*)parsed_value, (int) self, (int) parent); + GEDCOM_STRING(parsed_value), (int) self, (int) parent); return self; } @@ -88,6 +88,35 @@ void source_end(Gedcom_ctxt parent, Gedcom_ctxt self, Gedcom_val parsed_value) printf("Source context %d in parent %d\n", (int)self, (int)parent); } +Gedcom_ctxt source_date_start(Gedcom_ctxt parent, int level, char *tag, + char* raw_value, Gedcom_val parsed_value) +{ + struct date_value dv; + Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000); + dv = GEDCOM_DATE(parsed_value); + printf("Contents of the date_value:\n"); + printf(" raw value: %s\n", raw_value); + printf(" type: %d\n", dv.type); + printf(" date1:\n"); + printf(" calendar type: %d\n", dv.date1.cal); + printf(" day: %s\n", dv.date1.day_str); + printf(" month: %s\n", dv.date1.month_str); + printf(" year: %s\n", dv.date1.year_str); + printf(" date type: %d\n", dv.date1.type); + printf(" sdn1: %ld\n", dv.date1.sdn1); + printf(" sdn2: %ld\n", dv.date1.sdn2); + printf(" date2:\n"); + printf(" calendar type: %d\n", dv.date2.cal); + printf(" day: %s\n", dv.date2.day_str); + printf(" month: %s\n", dv.date2.month_str); + printf(" year: %s\n", dv.date2.year_str); + printf(" date type: %d\n", dv.date2.type); + printf(" sdn1: %ld\n", dv.date2.sdn1); + printf(" sdn2: %ld\n", dv.date2.sdn2); + printf(" phrase: %s\n", dv.phrase); + return self; +} + void default_cb(Gedcom_ctxt ctxt, int level, char *tag, char *raw_value) { printf("== %d %s %s (ctxt is %d)\n", level, tag, raw_value, (int)ctxt); @@ -99,6 +128,8 @@ void subscribe_callbacks() gedcom_subscribe_to_record(REC_FAM, family_start, family_end); gedcom_subscribe_to_record(REC_SUBM, submit_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); } void gedcom_message_handler(Gedcom_msg_type type, char *msg) -- 2.30.2