More verbosity in date errors.

diff --git a/gedcom/date.c b/gedcom/date.c
index 9c086e7e2494ccb4de39d7517826ff574acbe710..19fd43459f2aba436161c804c05e709eaf1a12c3 100644 (file)
--- a/gedcom/date.c
+++ b/gedcom/date.c
@@ -425,7 +425,8 @@ struct date_value gedcom_parse_date(const char* line_value)
       result |= numbers_to_sdn(&dv_s.date2);
   }
   if (result != 0) {
-    gedcom_date_error(_("Putting date in 'phrase' member"));
+    gedcom_date_error(_("Putting date '%s' in 'phrase' member"),
+                     curr_line_value);
     make_date_value(DV_PHRASE, &dv_s.date1, &dv_s.date2, curr_line_value);
   }
   return dv_s;

diff --git a/gedcom/gedcom_date.y b/gedcom/gedcom_date.y
index e38769eefbfd7e3b8d45529eed7085961a1fa598..a8c829ca7b23cdb45dd7f312bfbc09ec50ab1589 100644 (file)
--- a/gedcom/gedcom_date.y
+++ b/gedcom/gedcom_date.y
@@ -126,7 +126,7 @@ date_value   : date           { make_date_value(DV_NO_MODIFIER,
               }
              | error { /* On error: put entire string in 'phrase' member
                          as fallback */
-                      gedcom_date_error(_("Putting date in 'phrase' member"));
+                      gedcom_date_error(_("Putting date '%s' in 'phrase' member"), curr_line_value);
                       make_date_value(DV_PHRASE,
                                       &def_date, &def_date, curr_line_value);
                       YYABORT;

diff --git a/t/output/compat-famorig.ref b/t/output/compat-famorig.ref
index 5c6987bacc0a8eed71b156335514964cdea8999f..21607c090c25db2d89f5eecdc71dc50a592ad7e4 100644 (file)
--- a/t/output/compat-famorig.ref
+++ b/t/output/compat-famorig.ref
@@ -141,7 +141,7 @@ Rec INDI start, xref is @I71@
 == 1 NOTE (348) twin, probably unmarried. (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 97: Error converting date: year 1739, month 2, day 29
-WARNING: Warning on line 97: Putting date in 'phrase' member
+WARNING: Warning on line 97: Putting date '29 FEB 1739' in 'phrase' member
 Contents of the date_value:
   raw value: 29 FEB 1739
   type: 11
@@ -355,7 +355,7 @@ Rec INDI start, xref is @I71@
 == 1 NOTE (348) twin, probably unmarried. (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 97: Error converting date: year 1739, month 2, day 29
-WARNING: Warning on line 97: Putting date in 'phrase' member
+WARNING: Warning on line 97: Putting date '29 FEB 1739' in 'phrase' member
 Contents of the date_value:
   raw value: 29 FEB 1739
   type: 11

diff --git a/t/output/compat-lifelines.ref b/t/output/compat-lifelines.ref
index 0e229cf91ace0fca9a47fa4141ffaa95a3dc464d..9ff5da785c99c6dec13c56953059c95ab553d3be 100644 (file)
--- a/t/output/compat-lifelines.ref
+++ b/t/output/compat-lifelines.ref
@@ -20,7 +20,7 @@ Family start, xref is @F1@
 == 1 HUSB (330) @I7@ (ctxt is 1, conversion failures: 0)
 == 1 MARR (339) (null) (ctxt is 1, conversion failures: 0)
 WARNING: Warning on line 9: Empty value changed to '-'
-WARNING: Warning on line 9: Putting date in 'phrase' member
+WARNING: Warning on line 9: Putting date '-' in 'phrase' member
 Contents of the date_value:
   raw value: -
   type: 11
@@ -73,7 +73,7 @@ Contents of the date_value:
 == 2 SOUR (377) ongeveer 1360 (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 21: Empty value changed to '-'
-WARNING: Warning on line 21: Putting date in 'phrase' member
+WARNING: Warning on line 21: Putting date '-' in 'phrase' member
 Contents of the date_value:
   raw value: -
   type: 11
@@ -123,7 +123,7 @@ Family start, xref is @F1@
 == 1 HUSB (330) @I7@ (ctxt is 2, conversion failures: 0)
 == 1 MARR (339) (null) (ctxt is 2, conversion failures: 0)
 WARNING: Warning on line 9: Empty value changed to '-'
-WARNING: Warning on line 9: Putting date in 'phrase' member
+WARNING: Warning on line 9: Putting date '-' in 'phrase' member
 Contents of the date_value:
   raw value: -
   type: 11
@@ -176,7 +176,7 @@ Contents of the date_value:
 == 2 SOUR (377) ongeveer 1360 (ctxt is 333, conversion failures: 0)
 == 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 21: Empty value changed to '-'
-WARNING: Warning on line 21: Putting date in 'phrase' member
+WARNING: Warning on line 21: Putting date '-' in 'phrase' member
 Contents of the date_value:
   raw value: -
   type: 11

diff --git a/t/output/compat-paf2.ref b/t/output/compat-paf2.ref
index 2462019c21be98ecb4e44e1f2f304641081bf43a..9dbb289e146a2a433c6c068458534007e4bd16eb 100644 (file)
--- a/t/output/compat-paf2.ref
+++ b/t/output/compat-paf2.ref
@@ -26701,7 +26701,7 @@ Rec INDI start, xref is @I716@
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 6436: Year is missing: '10 JAN'
-WARNING: Warning on line 6436: Putting date in 'phrase' member
+WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
 Contents of the date_value:
   raw value: 10 JAN
   type: 11
@@ -49598,7 +49598,7 @@ Rec INDI start, xref is @I1384@
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 12060: Year after slash should be following year: '1056/60'
-WARNING: Warning on line 12060: Putting date in 'phrase' member
+WARNING: Warning on line 12060: Putting date '       1056/1060' in 'phrase' member
 Contents of the date_value:
   raw value:        1056/1060
   type: 11
@@ -50119,7 +50119,7 @@ Rec INDI start, xref is @I1398@
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 12199: Year after slash should be following year: '1103/05'
-WARNING: Warning on line 12199: Putting date in 'phrase' member
+WARNING: Warning on line 12199: Putting date 'ABT    1103/1105' in 'phrase' member
 Contents of the date_value:
   raw value: ABT    1103/1105
   type: 11
@@ -99336,7 +99336,7 @@ Family start, xref is @F602@
 == 1 WIFE (392) @I1369@ (ctxt is 602, conversion failures: 0)
 == 1 MARR (339) (null) (ctxt is 602, conversion failures: 0)
 WARNING: Warning on line 27126: Year is missing: '20 JUL'
-WARNING: Warning on line 27126: Putting date in 'phrase' member
+WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
 Contents of the date_value:
   raw value: 20 JUL
   type: 11
@@ -135173,7 +135173,7 @@ Rec INDI start, xref is @I716@
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 6436: Year is missing: '10 JAN'
-WARNING: Warning on line 6436: Putting date in 'phrase' member
+WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
 Contents of the date_value:
   raw value: 10 JAN
   type: 11
@@ -158070,7 +158070,7 @@ Rec INDI start, xref is @I1384@
 == 1 SEX (374) M (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 12060: Year after slash should be following year: '1056/60'
-WARNING: Warning on line 12060: Putting date in 'phrase' member
+WARNING: Warning on line 12060: Putting date '       1056/1060' in 'phrase' member
 Contents of the date_value:
   raw value:        1056/1060
   type: 11
@@ -158591,7 +158591,7 @@ Rec INDI start, xref is @I1398@
 == 1 SEX (374) F (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 12199: Year after slash should be following year: '1103/05'
-WARNING: Warning on line 12199: Putting date in 'phrase' member
+WARNING: Warning on line 12199: Putting date 'ABT    1103/1105' in 'phrase' member
 Contents of the date_value:
   raw value: ABT    1103/1105
   type: 11
@@ -207808,7 +207808,7 @@ Family start, xref is @F602@
 == 1 WIFE (392) @I1369@ (ctxt is 2024, conversion failures: 0)
 == 1 MARR (339) (null) (ctxt is 2024, conversion failures: 0)
 WARNING: Warning on line 27126: Year is missing: '20 JUL'
-WARNING: Warning on line 27126: Putting date in 'phrase' member
+WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
 Contents of the date_value:
   raw value: 20 JUL
   type: 11

diff --git a/t/output/dates.ref b/t/output/dates.ref
index b21599fa25395901c6bd82c6d9d2e4cc85920171..485229e5c3da339988ebdbbfb7fb70cb512b2a41 100644 (file)
--- a/t/output/dates.ref
+++ b/t/output/dates.ref
@@ -154,7 +154,7 @@ Rec INDI start, xref is @PERS06@
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 37: Unknown calendar type
 WARNING: Warning on line 37: parse error
-WARNING: Warning on line 37: Putting date in 'phrase' member
+WARNING: Warning on line 37: Putting date '@#DFRENCH@ 03 BRUM 4' in 'phrase' member
 Contents of the date_value:
   raw value: @#DFRENCH@ 03 BRUM 4
   type: 11
@@ -271,7 +271,7 @@ Rec INDI start, xref is @PERS11@
 == 1 NAME (342) /Invalid date/ (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 57: Error converting date: year 1739, month 2, day 29
-WARNING: Warning on line 57: Putting date in 'phrase' member
+WARNING: Warning on line 57: Putting date '29 FEB 1739' in 'phrase' member
 Contents of the date_value:
   raw value: 29 FEB 1739
   type: 11
@@ -462,7 +462,7 @@ Rec INDI start, xref is @PERS06@
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 37: Unknown calendar type
 WARNING: Warning on line 37: parse error
-WARNING: Warning on line 37: Putting date in 'phrase' member
+WARNING: Warning on line 37: Putting date '@#DFRENCH@ 03 BRUM 4' in 'phrase' member
 Contents of the date_value:
   raw value: @#DFRENCH@ 03 BRUM 4
   type: 11
@@ -579,7 +579,7 @@ Rec INDI start, xref is @PERS11@
 == 1 NAME (342) /Invalid date/ (ctxt is 333, conversion failures: 0)
 == 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0)
 WARNING: Warning on line 57: Error converting date: year 1739, month 2, day 29
-WARNING: Warning on line 57: Putting date in 'phrase' member
+WARNING: Warning on line 57: Putting date '29 FEB 1739' in 'phrase' member
 Contents of the date_value:
   raw value: 29 FEB 1739
   type: 11

diff --git a/t/output/dates_gom.ref b/t/output/dates_gom.ref
index 576504f896891fd7a258ab4d0a9d8722c1c9b631..b301c0ebdb7b5ae8aff3d3855418fdbbb7b26b69 100644 (file)
--- a/t/output/dates_gom.ref
+++ b/t/output/dates_gom.ref
@@ -2,9 +2,9 @@
 === Parsing file dates.ged
 Warning on line 37: Unknown calendar type
 Warning on line 37: parse error
-Warning on line 37: Putting date in 'phrase' member
+Warning on line 37: Putting date '@#DFRENCH@ 03 BRUM 4' in 'phrase' member
 Warning on line 57: Error converting date: year 1739, month 2, day 29
-Warning on line 57: Putting date in 'phrase' member
+Warning on line 57: Putting date '29 FEB 1739' in 'phrase' member
 Warning: Cross-reference @PERS07@ defined on line 38 is never used
 Warning: Cross-reference @PERS02@ defined on line 18 is never used
 Warning: Cross-reference @PERS00@ defined on line 10 is never used

diff --git a/t/output/write_gom_compat-famorig.ref b/t/output/write_gom_compat-famorig.ref
index b83f79c6d97603b523444b17cf372a9f9788ae56..1a76a8e3b967e553164f33255928416205ed8570 100644 (file)
--- a/t/output/write_gom_compat-famorig.ref
+++ b/t/output/write_gom_compat-famorig.ref
@@ -1,6 +1,6 @@
 WARNING: Warning on line 5: Enabling compatibility with 'Family Origins'
 WARNING: Warning on line 97: Error converting date: year 1739, month 2, day 29
-WARNING: Warning on line 97: Putting date in 'phrase' member
+WARNING: Warning on line 97: Putting date '29 FEB 1739' in 'phrase' member
 WARNING: Warning: Cross-reference @I1@ defined on line 22 is never used
 Writing file...
 Re-parsing file...

diff --git a/t/output/write_gom_compat-lifelines.ref b/t/output/write_gom_compat-lifelines.ref
index ad9767697aabfeaf7d048ed454c119965caed56f..46f9d44ae90eeb8bcd559c4b85d60b8d83d6edbb 100644 (file)
--- a/t/output/write_gom_compat-lifelines.ref
+++ b/t/output/write_gom_compat-lifelines.ref
@@ -2,9 +2,9 @@ WARNING: Warning on line 2: Enabling compatibility with 'Lifelines'
 WARNING: Warning on line 5: Header change time '17:43' lost in the compatibility (out of context)
 WARNING: Warning on line 5: Adding link to submitter record with xref '@__COMPAT__SUBM__@'
 WARNING: Warning on line 9: Empty value changed to '-'
-WARNING: Warning on line 9: Putting date in 'phrase' member
+WARNING: Warning on line 9: Putting date '-' in 'phrase' member
 WARNING: Warning on line 21: Empty value changed to '-'
-WARNING: Warning on line 21: Putting date in 'phrase' member
+WARNING: Warning on line 21: Putting date '-' in 'phrase' member
 Writing file...
 Re-parsing file...
 Test succeeded

diff --git a/t/output/write_gom_compat-paf2.ref b/t/output/write_gom_compat-paf2.ref
index 6007533bf502bbd1e5758e2f8a52d038eb8546e8..724c3156133f13be41f4c60fcf304b3cf6209934 100644 (file)
--- a/t/output/write_gom_compat-paf2.ref
+++ b/t/output/write_gom_compat-paf2.ref
@@ -2,13 +2,13 @@ WARNING: Warning on line 2: Enabling compatibility with 'Personal Ancestral File
 WARNING: Warning on line 6: Adding link to submitter record with xref '@__COMPAT__SUBM__@'
 WARNING: Warning on line 13: Converting non-standard tag 'COMM' to user tag '_COMM'
 WARNING: Warning on line 6436: Year is missing: '10 JAN'
-WARNING: Warning on line 6436: Putting date in 'phrase' member
+WARNING: Warning on line 6436: Putting date '10 JAN' in 'phrase' member
 WARNING: Warning on line 12060: Year after slash should be following year: '1056/60'
-WARNING: Warning on line 12060: Putting date in 'phrase' member
+WARNING: Warning on line 12060: Putting date '       1056/1060' in 'phrase' member
 WARNING: Warning on line 12199: Year after slash should be following year: '1103/05'
-WARNING: Warning on line 12199: Putting date in 'phrase' member
+WARNING: Warning on line 12199: Putting date 'ABT    1103/1105' in 'phrase' member
 WARNING: Warning on line 27126: Year is missing: '20 JUL'
-WARNING: Warning on line 27126: Putting date in 'phrase' member
+WARNING: Warning on line 27126: Putting date '20 JUL' in 'phrase' member
 WARNING: Warning: Cross-reference @I359@ defined on line 3543 is never used
 WARNING: Warning: Cross-reference @S1@ defined on line 7 is never used
 WARNING: Warning: Cross-reference @I970@ defined on line 8497 is never used

diff --git a/t/output/write_gom_dates.ref b/t/output/write_gom_dates.ref
index 4aca811e162000826305b607461beb2a13aa11a3..9c5f50e63d8b26859a40bca38730a5116d9c693d 100644 (file)
--- a/t/output/write_gom_dates.ref
+++ b/t/output/write_gom_dates.ref
@@ -1,8 +1,8 @@
 WARNING: Warning on line 37: Unknown calendar type
 WARNING: Warning on line 37: parse error
-WARNING: Warning on line 37: Putting date in 'phrase' member
+WARNING: Warning on line 37: Putting date '@#DFRENCH@ 03 BRUM 4' in 'phrase' member
 WARNING: Warning on line 57: Error converting date: year 1739, month 2, day 29
-WARNING: Warning on line 57: Putting date in 'phrase' member
+WARNING: Warning on line 57: Putting date '29 FEB 1739' in 'phrase' member
 WARNING: Warning: Cross-reference @PERS07@ defined on line 38 is never used
 WARNING: Warning: Cross-reference @PERS02@ defined on line 18 is never used
 WARNING: Warning: Cross-reference @PERS00@ defined on line 10 is never used