#include "encoding.h"
#include "interface.h"
#include "date.h"
+#include "age.h"
#include "xref.h"
#include "compat.h"
int count_level = 0;
int fail = 0;
-int compat_enabled = 1;
int gedcom_high_level_debug = 0;
-int compatibility = 0;
Gedcom_err_mech error_mechanism = IMMED_FAIL;
Gedcom_val_struct val1;
Gedcom_val_struct val2;
char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1];
char *line_item_buf_ptr;
-enum _COMPAT {
- C_FTREE = 0x01
-};
-
/* These are defined at the bottom of the file */
void push_countarray();
void set_parenttag(char* tag);
void pop_countarray();
int count_tag(int tag);
int check_occurrence(int tag);
-void set_compatibility(char* program);
-int compat_mode(int flags);
#define CLEAR_BUFFER(BUF) \
memset(BUF, 0, sizeof(BUF));
}
%token_table
-%expect 303
+%expect 304
%token <string> BADTOKEN
%token <number> OPEN
CHECK3(SOUR, GEDC, CHAR);
compat_generate_submitter_link($<ctxt>4);
}
+ else if (compat_mode(C_LIFELINES)) {
+ CHECK1(SOUR);
+ compat_generate_submitter_link($<ctxt>4);
+ compat_generate_gedcom($<ctxt>4);
+ if (compat_generate_char($<ctxt>4)) YYABORT;
+ }
else
CHECK4(SOUR, SUBM, GEDC, CHAR)
}
CLOSE
{ end_record(REC_HEAD, $<ctxt>4);
- if (compat_mode(C_FTREE))
+ if (compat_mode(C_FTREE | C_LIFELINES))
compat_generate_submitter();
}
;
head_sub : head_sour_sect { OCCUR2(SOUR, 1, 1) }
| head_dest_sect { OCCUR2(DEST, 0, 1) }
| head_date_sect { OCCUR2(DATE, 0, 1) }
+ | head_time_sect { if (!compat_mode(C_LIFELINES))
+ INVALID_TAG("TIME");
+ OCCUR2(TIME, 0, 1) }
| head_subm_sect { OCCUR2(SUBM, 1, 1) }
| head_subn_sect { OCCUR2(SUBN, 0, 1) }
| head_file_sect { OCCUR2(FILE, 0, 1) }
}
;
+/* HEAD.TIME (Only for 'Lifelines' compatibility) */
+/* Just ignore the time... */
+head_time_sect : OPEN DELIM TAG_TIME opt_line_item
+ { }
+ CLOSE
+ ;
+
/* HEAD.SUBM */
head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
{ struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
}
;
event_detail_age_sect : OPEN DELIM TAG_AGE mand_line_item
- { $<ctxt>$
+ { struct age_value age = gedcom_parse_age($4);
+ $<ctxt>$
= start_element(ELT_SUB_EVT_AGE,
PARENT, $1, $3, $4,
- GEDCOM_MAKE_STRING(val1, $4));
+ GEDCOM_MAKE_AGE(val1, age));
START(AGE, $<ctxt>$)
}
no_std_subs
;
fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item
- { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_AGE,
+ { struct age_value age = gedcom_parse_age($4);
+ $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_AGE,
PARENT, $1, $3, $4,
- GEDCOM_MAKE_STRING(val1, $4));
+ GEDCOM_MAKE_AGE(val1, age));
START(AGE, $<ctxt>$)
}
no_std_subs
$$ = $2; }
;
-mand_line_item : /* empty */ { gedcom_error(_("Missing value")); YYERROR; }
+mand_line_item : /* empty */
+ { if (compat_mode(C_LIFELINES)) {
+ /* Lifelines tends to not care about mandatory values */
+ gedcom_debug_print("==Val: ==");
+ $$ = "";
+ }
+ else {
+ gedcom_error(_("Missing value")); YYERROR;
+ }
+ }
| DELIM line_item { gedcom_debug_print("==Val: %s==", $2);
$$ = $2; }
;
{
error_mechanism = mechanism;
}
-
-/* Compatibility handling */
-
-void gedcom_set_compat_handling(int enable_compat)
-{
- compat_enabled = enable_compat;
-}
-
-void set_compatibility(char* program)
-{
- if (compat_enabled) {
- if (! strncmp(program, "ftree", 6)) {
- gedcom_warning(_("Enabling compatibility with 'ftree'"));
- compatibility = C_FTREE;
- }
- else {
- compatibility = 0;
- }
- }
-}
-
-int compat_mode(int compat_flags)
-{
- return (compat_flags & compatibility);
-}
-