Start with compatibility for PAF 2.

diff --git a/gedcom/compat.c b/gedcom/compat.c
index cd85f044f064221cfbe2a40598d6a44a415499b0..1d882dc1ef0da1177b191737016652010cc8dcc7 100644 (file)
--- a/gedcom/compat.c
+++ b/gedcom/compat.c
@@ -50,7 +50,8 @@ enum _COMPAT_PROGRAM {
 enum _COMPAT {
   C_FTREE = 0x01,
   C_LIFELINES = 0x02,
-  C_PAF = 0x04
+  C_PAF5 = 0x04,
+  C_PAF2 = 0x08
 };
 
 /* Incompatibility list (with GEDCOM 5.5):
@@ -68,24 +69,31 @@ enum _COMPAT {
        - '@' not written as '@@' in values
        - lots of missing required values
 
-    - Personal Ancestral File:
+    - Personal Ancestral File 5:
         - '@' not written as '@@' in values
        - some 5.5.1 (draft) tags are used: EMAIL, FONE, ROMN
        - no FAMC field in SLGC
+
+    - Personal Ancestral File 2:
+        - '@' not written as '@@' in values
+       - COMM tag in submitter record
+       - double dates written as e.g. '1815/1816' instead of '1815/16'
  */
 
 int compat_matrix[] =
 {
-  /* C_NO_SUBMITTER */        C_FTREE | C_LIFELINES,
+  /* C_NO_SUBMITTER */        C_FTREE | C_LIFELINES | C_PAF2,
   /* C_INDI_ADDR */           C_FTREE,
   /* C_NOTE_NO_VALUE */       C_FTREE,
-  /* C_NO_GEDC */             C_LIFELINES,
+  /* C_NO_GEDC */             C_LIFELINES | C_PAF2,
   /* C_NO_CHAR */             C_LIFELINES,
   /* C_HEAD_TIME */           C_LIFELINES,
-  /* C_NO_DOUBLE_AT */        C_LIFELINES | C_PAF,
+  /* C_NO_DOUBLE_AT */        C_LIFELINES | C_PAF5 | C_PAF2,
   /* C_NO_REQUIRED_VALUES */  C_LIFELINES,
-  /* C_551_TAGS */            C_PAF,
-  /* C_NO_SLGC_FAMC */        C_PAF
+  /* C_551_TAGS */            C_PAF5,
+  /* C_NO_SLGC_FAMC */        C_PAF5,
+  /* C_SUBM_COMM */           C_PAF2,
+  /* C_DOUBLE_DATES_4 */      C_PAF2
 };
 
 int compat_state[C_NR_OF_RULES];
@@ -115,13 +123,13 @@ void set_compatibility_program(const char* program)
     }
     else if (! strncmp(program, "LIFELINES", 9)) {
       compatibility_program = CP_LIFELINES;
-      if (strlen(program) > 10 && program[9] = ' ')
-       set_compatibility_version(program + 10);
+      if (strlen(program) > 9)
+       set_compatibility_version(program + 9);
     }
     else if (! strncmp(program, "PAF", 3)) {
       compatibility_program = CP_PAF;
-      if (strlen(program) > 4 && program[3] = ' ')
-       set_compatibility_version(program + 4);
+      if (strlen(program) > 3)
+       set_compatibility_version(program + 3);
     }
   }
 }
@@ -132,8 +140,10 @@ void set_compatibility_version(const char* version)
     unsigned int major=0, minor=0, patch=0;
     int result;
     
-    result = sscanf(version, "%u.%u.%u", &major, &minor, &patch);
+    result = sscanf(version, " %u.%u.%u", &major, &minor, &patch);
     if (result > 0) {
+      gedcom_debug_print(_("Setting compat version to %u.%u.%u"),
+                        major, minor, patch);
       compatibility_version = major * 10000 + minor * 100 + patch;
     }
   }
@@ -159,8 +169,14 @@ void compute_compatibility()
       default_charset = "ANSI";
       break;
     case CP_PAF:
-      enable_compat_msg("Personal Ancestral File", 0);
-      compatibility = C_PAF;
+      if (compatibility_version >= 20000 && compatibility_version < 30000) {
+       enable_compat_msg("Personal Ancestral File", 2);
+       compatibility = C_PAF2;
+      }
+      else if (compatibility_version >= 50000) {
+       enable_compat_msg("Personal Ancestral File", 5);
+       compatibility = C_PAF5;
+      }
       break;
     default:
       break;
@@ -172,6 +188,10 @@ int compat_mode(Compat_rule rule)
   return (compat_matrix[rule] & compatibility);
 }
 
+/********************************************************************/
+/*  C_NO_SUBMITTER                                                  */
+/********************************************************************/
+
 void compat_generate_submitter_link(Gedcom_ctxt parent)
 {
   struct xref_value *xr = gedcom_parse_xref(SUBMITTER_LINK, XREF_USED,
@@ -219,6 +239,10 @@ void compat_generate_submitter()
   }
 }
 
+/********************************************************************/
+/*  C_NO_GEDC                                                       */
+/********************************************************************/
+
 void compat_generate_gedcom(Gedcom_ctxt parent)
 {
   struct tag_struct ts;
@@ -254,6 +278,10 @@ void compat_generate_gedcom(Gedcom_ctxt parent)
   end_element(ELT_HEAD_GEDC, parent, self1, NULL);
 }
 
+/********************************************************************/
+/*  C_NO_CHAR                                                       */
+/********************************************************************/
+
 int compat_generate_char(Gedcom_ctxt parent)
 {
   struct tag_struct ts;
@@ -282,6 +310,10 @@ int compat_generate_char(Gedcom_ctxt parent)
     return 0;
 }
 
+/********************************************************************/
+/*  C_INDI_ADDR                                                     */
+/********************************************************************/
+
 Gedcom_ctxt compat_generate_resi_start(Gedcom_ctxt parent)
 {
   Gedcom_ctxt self;
@@ -299,6 +331,10 @@ void compat_generate_resi_end(Gedcom_ctxt parent, Gedcom_ctxt self)
   end_element(ELT_SUB_INDIV_RESI, parent, self, NULL);
 }
 
+/********************************************************************/
+/*  C_551_TAGS                                                      */
+/********************************************************************/
+
 int is_551_tag(const char* tag)
 {
   if (strncmp(tag, "EMAIL", 6))
@@ -325,6 +361,10 @@ int compat_check_551_tag(const char* tag, struct safe_buffer* b)
     return 0;
 }
 
+/********************************************************************/
+/*  C_NO_SLGC_FAMC                                                  */
+/********************************************************************/
+
 void compat_generate_slgc_famc_link(Gedcom_ctxt parent)
 {
   struct xref_value *xr = gedcom_parse_xref(SLGC_FAMC_LINK, XREF_USED,
@@ -362,3 +402,60 @@ void compat_generate_slgc_famc_fam()
     end_record(REC_FAM, self, NULL);
   }
 }
+
+/********************************************************************/
+/*  C_SUBM_COMM                                                     */
+/********************************************************************/
+
+int compat_check_subm_comm(const char* tag, const char* parent_tag,
+                          struct safe_buffer* b)
+{
+  if (!strcmp(tag, "COMM") && !strcmp(parent_tag, "SUBM")) {
+    reset_buffer(b);
+    SAFE_BUF_ADDCHAR(b, '_');
+    safe_buf_append(b, tag);
+    gedcom_warning(_("Converting non-standard tag '%s' to user tag '%s'"),
+                  tag, get_buf_string(b));
+    compat_state[C_SUBM_COMM] = 1;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+void compat_close_subm_comm()
+{
+  compat_state[C_SUBM_COMM] = 0;
+}
+
+int compat_check_subm_comm_cont(const char* tag)
+{
+  if (compat_state[C_SUBM_COMM] && !strcmp(tag, "CONT")) {
+    compat_state[C_SUBM_COMM] = 2;
+    return 1;
+  }
+  else
+    return 0;
+}
+
+Gedcom_ctxt compat_subm_comm_cont_start(Gedcom_ctxt parent, const char* str)
+{
+  Gedcom_ctxt self = NULL;
+  struct tag_struct ts;
+
+  if (compat_state[C_SUBM_COMM] == 2) {
+    ts.string = "_CONT";
+    ts.value  = USERTAG;
+    self = start_element(ELT_USER, parent, 2, ts, str, &val2);
+  }
+
+  return self;
+}
+
+void compat_subm_comm_cont_end(Gedcom_ctxt parent, Gedcom_ctxt self)
+{
+  if (compat_state[C_SUBM_COMM] == 2) {
+    end_element(ELT_USER, parent, self, NULL);
+    compat_state[C_SUBM_COMM] = 1;
+  }
+}

diff --git a/gedcom/compat.h b/gedcom/compat.h
index e5597c9390ac6b85fbbcb5c98eec0e644034f4ee..7a1b0977520fa36e84bc16dedc98337e0bc4d269 100644 (file)
--- a/gedcom/compat.h
+++ b/gedcom/compat.h
@@ -38,21 +38,36 @@ typedef enum _COMPAT_RULES {
   C_NO_REQUIRED_VALUES,
   C_551_TAGS,
   C_NO_SLGC_FAMC,
+  C_SUBM_COMM,
+  C_DOUBLE_DATES_4,
   C_NR_OF_RULES
 } Compat_rule;
 
 void set_compatibility_program(const char* program);
 void set_compatibility_version(const char* version);
 void compute_compatibility();
-int  compat_mode(Compat_rule rule); 
+int  compat_mode(Compat_rule rule);
+
 void compat_generate_submitter_link(Gedcom_ctxt parent);
 void compat_generate_submitter();
+
 void compat_generate_gedcom(Gedcom_ctxt parent);
+
 int  compat_generate_char(Gedcom_ctxt parent);
+
 Gedcom_ctxt compat_generate_resi_start(Gedcom_ctxt parent);
 void compat_generate_resi_end(Gedcom_ctxt parent, Gedcom_ctxt self);
+
 int  compat_check_551_tag(const char* tag, struct safe_buffer* b);
+
 void compat_generate_slgc_famc_link(Gedcom_ctxt parent);
 void compat_generate_slgc_famc_fam();
 
+int  compat_check_subm_comm(const char* tag, const char* parent_tag,
+                           struct safe_buffer* b);
+void compat_close_subm_comm();
+int  compat_check_subm_comm_cont(const char* tag);
+Gedcom_ctxt compat_subm_comm_cont_start(Gedcom_ctxt parent, const char* str);
+void compat_subm_comm_cont_end(Gedcom_ctxt parent, Gedcom_ctxt self);
+
 #endif /* __COMPAT_H */

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 0564018e888f004ec6f70c99ece3ab97f543aaf1..ef95178d08664ece62d34a5cc91a6ced0adb1415 100644 (file)
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -3680,6 +3680,11 @@ user_sect   : OPEN DELIM opt_xref USERTAG
                      && compat_check_551_tag($4.string, &usertag_buffer)) {
                    $4.string = get_buf_string(&usertag_buffer);
                  }
+                 else if (compat_mode(C_SUBM_COMM) &&
+                          compat_check_subm_comm($4.string, get_parenttag(0),
+                                                 &usertag_buffer)) {
+                   $4.string = get_buf_string(&usertag_buffer);
+                 }
                  else {
                    gedcom_error(_("Undefined tag (and not a valid user tag): %s"),
                                 $4);
@@ -3696,11 +3701,21 @@ user_sect   : OPEN DELIM opt_xref USERTAG
              CLOSE
               { end_element(ELT_USER, PARENT, $<ctxt>7, 
                            GEDCOM_MAKE_NULL(val1));
+               if (compat_mode(C_SUBM_COMM))
+                 compat_close_subm_comm();
              }
             ;
 
 user_sects   : /* empty */     { }
             | user_sects user_sect { }
+            | user_sects gen_sect
+              { if (compat_mode(C_SUBM_COMM)) {
+                }
+               else {
+                 gedcom_error(_("Standard tag not allowed in user section"));
+                 YYERROR;
+               }
+             }
             ;
 
 opt_xref    : /* empty */        { $$ = NULL; }
@@ -3789,9 +3804,23 @@ error_sect  : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { }
             ;
 
 gen_sect    : OPEN DELIM opt_xref anystdtag
-              { INVALID_TAG($4.string); }
-              opt_value opt_sects CLOSE
-              { }
+              { if (compat_mode(C_SUBM_COMM)
+                   && compat_check_subm_comm_cont($4.string)) {
+                 /* Will pass here */
+               }
+               else {
+                 INVALID_TAG($4.string);
+               }
+             }
+              opt_value
+              { if (compat_mode(C_SUBM_COMM)) {
+                 $<ctxt>$ = compat_subm_comm_cont_start(PARENT, $6);
+                }
+             }
+             opt_sects CLOSE
+              { if (compat_mode(C_SUBM_COMM))
+                 compat_subm_comm_cont_end(PARENT, $<ctxt>7);
+             }
             ;
 
 gen_rec : gen_rec_top