diff --git a/data/tests/exp_sample.gw b/data/tests/exp_sample.gw index dd530c1dd..6cbcccb77 100644 --- a/data/tests/exp_sample.gw +++ b/data/tests/exp_sample.gw @@ -9,6 +9,12 @@ beg - h Hans_Peter.8 17/4/1904 #bp Rnne,_Bornholm,_Denmark 29/1/1977 #dp San_Francisco,_San_Francisco_Co.,_CA end +notes Hansdotter Anna.1 +beg +******************************************************************890123456789 +******************************************************************89 123456789 +end notes + notes Smith Hjalmar.5 beg BIOGRAPHY @@ -61,7 +67,7 @@ Some Bold Unicode Characters: ࣶǼЀج⿄㑝㵋 Some Italic Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈 end notes -fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897 +fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897 0 fam Smith Hjalmar.5 +31/10/1927 #mp Reno,_Washoe_Co.,_NV Ohman Marjorie.26 3/6/1903 #bp Denver,_Denver_Co.,_CO,_Denver_Co.,_Colorado,_USA 22/6/1980 #dp Reno,_Washoe_Co.,_NV beg @@ -98,13 +104,18 @@ beg - h Martin.17 1794..1796 #bp Tommarp,_Kristianstad_Ln,_Sweden #dp Sweden end -fam Willard Edwin.42 ~1886 +~1910 Smith Kirsti_Marie.2 +fam Willard Edwin.42 ~1886 0 +~1910 Smith Kirsti_Marie.2 fam Smith Magnes.38 +24/8/1884 #mp Rnne,_Bornholm,_Denmark Streiffert Anna.43 23/9/1860 #bp Hoya/Jona/Hoia,_Sweden 2/2/1927 #dp Rnne,_Bornholm,_Denmark fam Tester The.14 + Tester Mrs.44 0 beg -- h Tom.45 0 +- h Tom.45 Von_Tester_y_tested 0 +- Fake.46 von_Person 1954 #bp Fremont,_Alameda_Co.,_CA +- f Mary.47 0 +- f Martha.48 0 +- h John.49 0 +- h Mark.50 0 end notes Tester Mrs.44 diff --git a/data/tests/exp_sample.vcs b/data/tests/exp_sample.vcs index f2c14713c..b8a41b8bd 100644 --- a/data/tests/exp_sample.vcs +++ b/data/tests/exp_sample.vcs @@ -1,856 +1,516 @@ BEGIN:VCALENDAR PRODID:-//GNU//Gramps//EN -VERSION:1.0 - +VERSION:2.0 BEGIN:VEVENT -SUMMARY:Birth of Hansdotter, Anna -LOCATION:Lderup, Malmhus Ln, Sweden -DTSTART:18641002T000001 -DTEND:18641002T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Hansdotter, Anna -LOCATION:Lderup, Malmhus Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000000200000002@gramps.com +SUMMARY:1864 Hansdotter, Anna - Birth +LOCATION:Löderup, Malmöhus Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161002T000001 -DTEND:20161002T235959 +DTSTART:19991002T000001 +DTEND:19991002T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Hansdotter, Anna -LOCATION:Sparks, Washoe Co., NV -DTSTART:19450929T000001 -DTEND:19450929T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Hansdotter, Anna +DTSTAMP:20160522T151317Z +UID:0000000400000004@gramps.com +SUMMARY:1945 Hansdotter, Anna - Death LOCATION:Sparks, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160929T000001 -DTEND:20160929T235959 +DTSTART:19990929T000001 +DTEND:19990929T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Keith Lloyd -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19660811T000001 -DTEND:19660811T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Keith Lloyd +DTSTAMP:20160522T151317Z +UID:0000000800000008@gramps.com +SUMMARY:1966 Smith, Keith Lloyd - Birth LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160811T000001 -DTEND:20160811T235959 +DTSTART:19990811T000001 +DTEND:19990811T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Hans Peter -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19040417T000001 -DTEND:19040417T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hans Peter -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160604T213156Z +UID:0000000c0000000c@gramps.com +SUMMARY:1904 Smith, Hans Peter - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160417T000001 -DTEND:20160417T235959 +DTSTART:19990417T000001 +DTEND:19990417T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Hans Peter -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19770129T000001 -DTEND:19770129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Hans Peter +DTSTAMP:20160522T151317Z +UID:0000000e0000000e@gramps.com +SUMMARY:1977 Smith, Hans Peter - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160129T000001 -DTEND:20160129T235959 +DTSTART:19990129T000001 +DTEND:19990129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Hanna -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18210129T000001 -DTEND:18210129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hanna -LOCATION:Gladsax, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000001200000012@gramps.com +SUMMARY:1821 Smith, Hanna - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20160129T000001 -DTEND:20160129T235959 +DTSTART:19990129T000001 +DTEND:19990129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Nielsen, Herman Julius -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18890831T000001 -DTEND:18890831T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Nielsen, Herman Julius -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000001600000016@gramps.com +SUMMARY:1889 Nielsen, Herman Julius - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160831T000001 -DTEND:20160831T235959 +DTSTART:19990831T000001 +DTEND:19990831T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Marjorie Lee -LOCATION:Reno, Washoe Co., NV -DTSTART:19341104T000001 -DTEND:19341104T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Marjorie Lee +DTSTAMP:20160522T151317Z +UID:0000001d0000001d@gramps.com +SUMMARY:1934 Smith, Marjorie Lee - Birth LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20161104T000001 -DTEND:20161104T235959 +DTSTART:19991104T000001 +DTEND:19991104T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Gus -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18970911T000001 -DTEND:18970911T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Gus -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000002100000021@gramps.com +SUMMARY:1897 Smith, Gus - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160911T000001 -DTEND:20160911T235959 +DTSTART:19990911T000001 +DTEND:19990911T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Gus -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19631021T000001 -DTEND:19631021T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Gus +DTSTAMP:20160522T151317Z +UID:0000002200000022@gramps.com +SUMMARY:1963 Smith, Gus - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20161021T000001 -DTEND:20161021T235959 +DTSTART:19991021T000001 +DTEND:19991021T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Anderson, Jennifer -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19071105T000001 -DTEND:19071105T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Anderson, Jennifer -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000002400000024@gramps.com +SUMMARY:1907 Anderson, Jennifer - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161105T000001 -DTEND:20161105T235959 +DTSTART:19991105T000001 +DTEND:19991105T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Anderson, Jennifer -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19850529T000001 -DTEND:19850529T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Anderson, Jennifer +DTSTAMP:20160522T151317Z +UID:0000002500000025@gramps.com +SUMMARY:1985 Anderson, Jennifer - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160529T000001 -DTEND:20160529T235959 +DTSTART:19990529T000001 +DTEND:19990529T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Jones, Lillie Harriet -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19100502T000001 -DTEND:19100502T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Jones, Lillie Harriet -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000002700000027@gramps.com +SUMMARY:1910 Jones, Lillie Harriet - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160502T000001 -DTEND:20160502T235959 +DTSTART:19990502T000001 +DTEND:19990502T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Jones, Lillie Harriet -DTSTART:19900626T000001 -DTEND:19900626T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Jones, Lillie Harriet +DTSTAMP:20160522T151317Z +UID:0000002800000028@gramps.com +SUMMARY:1990 Jones, Lillie Harriet - Death RRULE:FREQ=YEARLY -DTSTART:20160626T000001 -DTEND:20160626T235959 +DTSTART:19990626T000001 +DTEND:19990626T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, John Hjalmar -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19320130T000001 -DTEND:19320130T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, John Hjalmar +DTSTAMP:20160522T151317Z +UID:0000002a0000002a@gramps.com +SUMMARY:1932 Smith, John Hjalmar - Birth LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160130T000001 -DTEND:20160130T235959 +DTSTART:19990130T000001 +DTEND:19990130T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Eric Lloyd -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19630828T000001 -DTEND:19630828T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Eric Lloyd +DTSTAMP:20160522T151317Z +UID:0000002d0000002d@gramps.com +SUMMARY:1963 Smith, Eric Lloyd - Birth LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160828T000001 -DTEND:20160828T235959 +DTSTART:19990828T000001 +DTEND:19990828T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Amber Marie -LOCATION:Hayward, Alameda Co., CA -DTSTART:19980412T000001 -DTEND:19980412T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Amber Marie +DTSTAMP:20160522T151317Z +UID:0000003100000031@gramps.com +SUMMARY:1998 Smith, Amber Marie - Birth LOCATION:Hayward, Alameda Co., CA RRULE:FREQ=YEARLY -DTSTART:20160412T000001 -DTEND:20160412T235959 +DTSTART:19990412T000001 +DTEND:19990412T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Carl Emil -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18991220T000001 -DTEND:18991220T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Carl Emil -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000003700000037@gramps.com +SUMMARY:1899 Smith, Carl Emil - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161220T000001 -DTEND:20161220T235959 +DTSTART:19991220T000001 +DTEND:19991220T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Carl Emil -LOCATION:Reno, Washoe Co., NV -DTSTART:19590128T000001 -DTEND:19590128T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Carl Emil +DTSTAMP:20160522T151317Z +UID:0000003800000038@gramps.com +SUMMARY:1959 Smith, Carl Emil - Death LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160128T000001 -DTEND:20160128T235959 +DTSTART:19990128T000001 +DTEND:19990128T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18930131T000001 -DTEND:18930131T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000003a0000003a@gramps.com +SUMMARY:1893 Smith, Hjalmar - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160131T000001 -DTEND:20160131T235959 +DTSTART:19990131T000001 +DTEND:19990131T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18940925T000001 -DTEND:18940925T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000003b0000003b@gramps.com +SUMMARY:1894 Smith, Hjalmar - Death +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160925T000001 -DTEND:20160925T235959 +DTSTART:19990925T000001 +DTEND:19990925T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Martin -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18301119T000001 -DTEND:18301119T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Martin -LOCATION:Gladsax, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000003d0000003d@gramps.com +SUMMARY:1830 Smith, Martin - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161119T000001 -DTEND:20161119T235959 +DTSTART:19991119T000001 +DTEND:19991119T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18890131T000001 -DTEND:18890131T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000004400000044@gramps.com +SUMMARY:1889 Smith, Astrid Shermanna Augusta - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160131T000001 -DTEND:20160131T235959 +DTSTART:19990131T000001 +DTEND:19990131T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Astrid Shermanna Augusta -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19631221T000001 -DTEND:19631221T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Astrid Shermanna Augusta +DTSTAMP:20160522T151317Z +UID:0000004500000045@gramps.com +SUMMARY:1963 Smith, Astrid Shermanna Augusta - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20161221T000001 -DTEND:20161221T235959 +DTSTART:19991221T000001 +DTEND:19991221T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Gustaf Sr. -LOCATION:Grostorp, Kristianstad Ln, Sweden -DTSTART:18621128T000001 -DTEND:18621128T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Gustaf Sr. -LOCATION:Grostorp, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000004700000047@gramps.com +SUMMARY:1862 Smith, Gustaf Sr. - Birth +LOCATION:Grostorp, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161128T000001 -DTEND:20161128T235959 +DTSTART:19991128T000001 +DTEND:19991128T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Kirsti Marie -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18861215T000001 -DTEND:18861215T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Kirsti Marie -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000005100000051@gramps.com +SUMMARY:1886 Smith, Kirsti Marie - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161215T000001 -DTEND:20161215T235959 +DTSTART:19991215T000001 +DTEND:19991215T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Kirsti Marie -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19660718T000001 -DTEND:19660718T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Kirsti Marie +DTSTAMP:20160522T151317Z +UID:0000005200000052@gramps.com +SUMMARY:1966 Smith, Kirsti Marie - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160718T000001 -DTEND:20160718T235959 +DTSTART:19990718T000001 +DTEND:19990718T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Streiffert, Anna -LOCATION:Hoya/Jona/Hoia, Sweden -DTSTART:18600923T000001 -DTEND:18600923T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Streiffert, Anna +DTSTAMP:20160522T151317Z +UID:0000005700000057@gramps.com +SUMMARY:1860 Streiffert, Anna - Birth LOCATION:Hoya/Jona/Hoia, Sweden RRULE:FREQ=YEARLY -DTSTART:20160923T000001 -DTEND:20160923T235959 +DTSTART:19990923T000001 +DTEND:19990923T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19270202T000001 -DTEND:19270202T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000005900000059@gramps.com +SUMMARY:1927 Streiffert, Anna - Death +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160202T000001 -DTEND:20160202T235959 +DTSTART:19990202T000001 +DTEND:19990202T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Magnes -LOCATION:Simrishamn, Kristianstad Ln, Sweden -DTSTART:18581006T000001 -DTEND:18581006T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Magnes -LOCATION:Simrishamn, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000006000000060@gramps.com +SUMMARY:1858 Smith, Magnes - Birth +LOCATION:Simrishamn, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161006T000001 -DTEND:20161006T235959 +DTSTART:19991006T000001 +DTEND:19991006T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Magnes -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19100220T000001 -DTEND:19100220T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Magnes -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000006200000062@gramps.com +SUMMARY:1910 Smith, Magnes - Death +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160220T000001 -DTEND:20160220T235959 +DTSTART:19990220T000001 +DTEND:19990220T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Adams, Janice Ann -LOCATION:Fremont, Alameda Co., CA -DTSTART:19650826T000001 -DTEND:19650826T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Adams, Janice Ann +DTSTAMP:20160522T151317Z +UID:0000006400000064@gramps.com +SUMMARY:1965 Adams, Janice Ann - Birth LOCATION:Fremont, Alameda Co., CA RRULE:FREQ=YEARLY -DTSTART:20160826T000001 -DTEND:20160826T235959 +DTSTART:19990826T000001 +DTEND:19990826T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Ohman, Marjorie -LOCATION:Denver, Denver Co., CO, Denver Co., Colorado, USA -DTSTART:19030603T000001 -DTEND:19030603T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Ohman, Marjorie +DTSTAMP:20160522T151317Z +UID:0000006900000069@gramps.com +SUMMARY:1903 Ohman, Marjorie - Birth LOCATION:Denver, Denver Co., CO, Denver Co., Colorado, USA RRULE:FREQ=YEARLY -DTSTART:20160603T000001 -DTEND:20160603T235959 +DTSTART:19990603T000001 +DTEND:19990603T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Ohman, Marjorie -LOCATION:Reno, Washoe Co., NV -DTSTART:19800622T000001 -DTEND:19800622T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Ohman, Marjorie +DTSTAMP:20160522T151317Z +UID:0000006b0000006b@gramps.com +SUMMARY:1980 Ohman, Marjorie - Death LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160622T000001 -DTEND:20160622T235959 +DTSTART:19990622T000001 +DTEND:19990622T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Horne, Darcy -LOCATION:Sacramento, Sacramento Co., CA -DTSTART:19660702T000001 -DTEND:19660702T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Horne, Darcy +DTSTAMP:20160522T151317Z +UID:0000006d0000006d@gramps.com +SUMMARY:1966 Horne, Darcy - Birth LOCATION:Sacramento, Sacramento Co., CA RRULE:FREQ=YEARLY -DTSTART:20160702T000001 -DTEND:20160702T235959 +DTSTART:19990702T000001 +DTEND:19990702T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Perkins, Alice Paula -LOCATION:Sparks, Washoe Co., NV -DTSTART:19331122T000001 -DTEND:19331122T235959 +DTSTAMP:20160522T151317Z +UID:0000007000000070@gramps.com +SUMMARY:1935 Smith, Lloyd - Birth +LOCATION:San Francisco, San Francisco Co., CA +RRULE:FREQ=YEARLY +DTSTART:19990313T000001 +DTEND:19990313T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Perkins, Alice Paula +DTSTAMP:20160522T151317Z +UID:0000007200000072@gramps.com +SUMMARY:1933 Perkins, Alice Paula - Birth LOCATION:Sparks, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20161122T000001 -DTEND:20161122T235959 +DTSTART:19991122T000001 +DTEND:19991122T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Lars Peter -LOCATION:Santa Rosa, Sonoma Co., CA -DTSTART:19910916T000001 -DTEND:19910916T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Lars Peter +DTSTAMP:20160522T151317Z +UID:0000007400000074@gramps.com +SUMMARY:1991 Smith, Lars Peter - Birth LOCATION:Santa Rosa, Sonoma Co., CA RRULE:FREQ=YEARLY -DTSTART:20160916T000001 -DTEND:20160916T235959 +DTSTART:19990916T000001 +DTEND:19990916T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Ingeman -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18260129T000001 -DTEND:18260129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Ingeman -LOCATION:Gladsax, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000007800000078@gramps.com +SUMMARY:1800 Jefferson, Elna - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20160129T000001 -DTEND:20160129T235959 +DTSTART:19990914T000001 +DTEND:19990914T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Lloyd -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19350313T000001 -DTEND:19350313T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Lloyd -LOCATION:San Francisco, San Francisco Co., CA -RRULE:FREQ=YEARLY -DTSTART:20160313T000001 -DTEND:20160313T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Jefferson, Elna -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18000914T000001 -DTEND:18000914T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Jefferson, Elna -LOCATION:Gladsax, Kristianstad Ln, Sweden -RRULE:FREQ=YEARLY -DTSTART:20160914T000001 -DTEND:20160914T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Edwin Michael -LOCATION:San Jose, Santa Clara Co., CA -DTSTART:19610524T000001 -DTEND:19610524T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Edwin Michael +DTSTAMP:20160522T151317Z +UID:0000007e0000007e@gramps.com +SUMMARY:1961 Smith, Edwin Michael - Birth LOCATION:San Jose, Santa Clara Co., CA RRULE:FREQ=YEARLY -DTSTART:20160524T000001 -DTEND:20160524T235959 +DTSTART:19990524T000001 +DTEND:19990524T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Hansdotter, Kerstina -LOCATION:Smestorp, Kristianstad Ln, Sweden -DTSTART:18321129T000001 -DTEND:18321129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Hansdotter, Kerstina -LOCATION:Smestorp, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000008800000088@gramps.com +SUMMARY:1832 Hansdotter, Kerstina - Birth +LOCATION:Smestorp, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161129T000001 -DTEND:20161129T235959 +DTSTART:19991129T000001 +DTEND:19991129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Marjorie Alice -LOCATION:San Jose, Santa Clara Co., CA -DTSTART:19600205T000001 -DTEND:19600205T235959 +DTSTAMP:20160522T151317Z +UID:0000009000000090@gramps.com +SUMMARY:1826 Smith, Ingeman - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden +RRULE:FREQ=YEARLY +DTSTART:19990129T000001 +DTEND:19990129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Marjorie Alice +DTSTAMP:20160522T151317Z +UID:0000009200000092@gramps.com +SUMMARY:1960 Smith, Marjorie Alice - Birth LOCATION:San Jose, Santa Clara Co., CA RRULE:FREQ=YEARLY -DTSTART:20160205T000001 -DTEND:20160205T235959 +DTSTART:19990205T000001 +DTEND:19990205T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Green, Janis Elaine -DTSTART:19351202T000001 -DTEND:19351202T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Green, Janis Elaine +DTSTAMP:20160522T151317Z +UID:0000009400000094@gramps.com +SUMMARY:1935 Green, Janis Elaine - Birth RRULE:FREQ=YEARLY -DTSTART:20161202T000001 -DTEND:20161202T235959 +DTSTART:19991202T000001 +DTEND:19991202T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Mason Michael -LOCATION:Hayward, Alameda Co., CA -DTSTART:19960626T000001 -DTEND:19960626T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Mason Michael +DTSTAMP:20160522T151317Z +UID:0000009600000096@gramps.com +SUMMARY:1996 Smith, Mason Michael - Birth LOCATION:Hayward, Alameda Co., CA RRULE:FREQ=YEARLY -DTSTART:20160626T000001 -DTEND:20160626T235959 +DTSTART:19990626T000001 +DTEND:19990626T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18950407T000001 -DTEND:18950407T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000009d0000009d@gramps.com +SUMMARY:1895 Smith, Hjalmar - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160407T000001 -DTEND:20160407T235959 +DTSTART:19990407T000001 +DTEND:19990407T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Hjalmar -LOCATION:Reno, Washoe Co., NV -DTSTART:19750626T000001 -DTEND:19750626T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Hjalmar +DTSTAMP:20160522T151317Z +UID:0000009e0000009e@gramps.com +SUMMARY:1975 Smith, Hjalmar - Death LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160626T000001 -DTEND:20160626T235959 +DTSTART:19990626T000001 +DTEND:19990626T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Emil -LOCATION:Simrishamn, Kristianstad Ln, Sweden -DTSTART:18600927T000001 -DTEND:18600927T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Emil -LOCATION:Simrishamn, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:000000a4000000a4@gramps.com +SUMMARY:1860 Smith, Emil - Birth +LOCATION:Simrishamn, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20160927T000001 -DTEND:20160927T235959 +DTSTART:19990927T000001 +DTEND:19990927T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Tester, The -LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA -DTSTART:19541229T000001 -DTEND:19541229T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Tester, The +DTSTAMP:20160829T195148Z +UID:d65a44813a618a10a0abaa1ed6a@gramps.com +SUMMARY:1954 Tester, The - Birth LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA RRULE:FREQ=YEARLY -DTSTART:20161229T000001 -DTEND:20161229T235959 +DTSTART:19991229T000001 +DTEND:19991229T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Gustaf Sr. and Hansdotter, Anna -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18851127T000001 -DTEND:18851127T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Gustaf Sr. and Hansdotter, Anna -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:000000b1000000b1@gramps.com +SUMMARY:1885 Smith, Gustaf Sr. and Hansdotter, Anna - Marriage +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161127T000001 -DTEND:20161127T235959 +DTSTART:19991127T000001 +DTEND:19991127T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Lloyd and Green, Janis Elaine -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19580810T000001 -DTEND:19580810T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Lloyd and Green, Janis Elaine +DTSTAMP:20160522T151317Z +UID:000000b6000000b6@gramps.com +SUMMARY:1958 Smith, Lloyd and Green, Janis Elaine - Marriage LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160810T000001 -DTEND:20160810T235959 +DTSTART:19990810T000001 +DTEND:19990810T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19121130T000001 -DTEND:19121130T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:000000b3000000b3@gramps.com +SUMMARY:1912 Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta - M + arriage +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161130T000001 -DTEND:20161130T235959 +DTSTART:19991130T000001 +DTEND:19991130T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Hjalmar and Ohman, Marjorie -LOCATION:Reno, Washoe Co., NV -DTSTART:19271031T000001 -DTEND:19271031T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Hjalmar and Ohman, Marjorie +DTSTAMP:20160522T151317Z +UID:000000b4000000b4@gramps.com +SUMMARY:1927 Smith, Hjalmar and Ohman, Marjorie - Marriage LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20161031T000001 -DTEND:20161031T235959 +DTSTART:19991031T000001 +DTEND:19991031T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, John Hjalmar and Perkins, Alice Paula -LOCATION:Sparks, Washoe Co., NV -DTSTART:19540604T000001 -DTEND:19540604T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, John Hjalmar and Perkins, Alice Paula +DTSTAMP:20160522T151317Z +UID:000000aa000000aa@gramps.com +SUMMARY:1954 Smith, John Hjalmar and Perkins, Alice Paula - Marriage LOCATION:Sparks, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160604T000001 -DTEND:20160604T235959 +DTSTART:19990604T000001 +DTEND:19990604T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Eric Lloyd and Horne, Darcy -LOCATION:Woodland, Yolo Co., CA -DTSTART:19860712T000001 -DTEND:19860712T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Eric Lloyd and Horne, Darcy +DTSTAMP:20160522T151317Z +UID:000000a7000000a7@gramps.com +SUMMARY:1986 Smith, Eric Lloyd and Horne, Darcy - Marriage LOCATION:Woodland, Yolo Co., CA RRULE:FREQ=YEARLY -DTSTART:20160712T000001 -DTEND:20160712T235959 +DTSTART:19990712T000001 +DTEND:19990712T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Edwin Michael and Adams, Janice Ann -LOCATION:San Ramon, Conta Costa Co., CA -DTSTART:19950527T000001 -DTEND:19950527T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Edwin Michael and Adams, Janice Ann +DTSTAMP:20160522T151317Z +UID:000000ad000000ad@gramps.com +SUMMARY:1995 Smith, Edwin Michael and Adams, Janice Ann - Marriage LOCATION:San Ramon, Conta Costa Co., CA RRULE:FREQ=YEARLY -DTSTART:20160527T000001 -DTEND:20160527T235959 +DTSTART:19990527T000001 +DTEND:19990527T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Magnes and Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18840824T000001 -DTEND:18840824T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Magnes and Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:000000a9000000a9@gramps.com +SUMMARY:1884 Smith, Magnes and Streiffert, Anna - Marriage +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160824T000001 -DTEND:20160824T235959 +DTSTART:19990824T000001 +DTEND:19990824T235959 END:VEVENT - END:VCALENDAR diff --git a/data/tests/exp_sample.wft b/data/tests/exp_sample.wft index 4d3bf92ed..323cd3c31 100644 --- a/data/tests/exp_sample.wft +++ b/data/tests/exp_sample.wft @@ -1,47 +1,52 @@ -Anna Hansdotter;;;;;2/10/1864-29/9/1945 -Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966 -Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977 -Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821 -Herman Julius Nielsen;;;;;31/8/1889-1945 -Evelyn Michaels;;;;;1897 -Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934 -Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963 -Jennifer Anderson;;;;;5/11/1907-29/5/1985 -Lillie Harriet Jones;;;;;2/5/1910-26/6/1990 -John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932 -Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963 -Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998 -Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959 -Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894 -Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899 -Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963 -Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930 -Marta Ericsdotter;;;;;1775 -Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966 -Ingeman Smith;;;;;1770 -Anna Streiffert;;;;;23/9/1860-2/2/1927 -Craig Peter Smith;Lloyd Smith;Janis Green;;;1966 -Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910 -Janice Ann Adams;;;;;26/8/1965 -Marjorie Ohman;;;;;3/6/1903-22/6/1980 -Darcy Horne;;;;;2/7/1966 -Alice Paula Perkins;;;;;22/11/1933 -Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991 -Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826 -Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935 -Elna Jefferson;;;;;14/9/1800- -Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961 -Kerstina Hansdotter;;;;;29/11/1832-1908 -Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794- -Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960 -Janis Elaine Green;;;;;2/12/1935 -Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996 -Edwin Willard;;;;;1886 -Ingar Smith;Martin Smith0;Elna Jefferson;;;1823 -Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975 -Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860 -雪 Ke 柯;Herman Nielsen;Astrid Smith;;; -The Tester;Lloyd Smith;Janis Green;;;29/12/1954 -Mrs Tester;;;;; -ピーター リチミシキスイミ;;;;; -Tom Tester;The Tester;Mrs Tester;;; +Anna Hansdotter;;;;;2/10/1864-29/9/1945 +Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966 +Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977 +Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821 +Herman Julius Nielsen;;;;;31/8/1889-1945 +Evelyn Michaels;;;;;1897 +Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934 +Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963 +Jennifer Anderson;;;;;5/11/1907-29/5/1985 +Lillie Harriet Jones;;;;;2/5/1910-26/6/1990 +John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932 +Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963 +Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998 +Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959 +Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894 +Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899 +Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963 +Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930 +Marta Ericsdotter;;;;;1775 +Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966 +Ingeman Smith;;;;;1770 +Anna Streiffert;;;;;23/9/1860-2/2/1927 +Craig Peter Smith;Lloyd Smith;Janis Green;;;1966 +Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910 +Janice Ann Adams;;;;;26/8/1965 +Marjorie Ohman;;;;;3/6/1903-22/6/1980 +Darcy Horne;;;;;2/7/1966 +Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935 +Alice Paula Perkins;;;;;22/11/1933 +Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991 +Elna Jefferson;;;;;14/9/1800- +Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961 +Kerstina Hansdotter;;;;;29/11/1832-1908 +Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794- +Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826 +Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960 +Janis Elaine Green;;;;;2/12/1935 +Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996 +Edwin Willard;;;;;1886 +Ingar Smith;Martin Smith0;Elna Jefferson;;;1823 +Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975 +Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860 +雪 Ke 柯;Herman Nielsen;Astrid Smith;;; +ピーター リチミシキスイミ;;;;; +The Tester;Lloyd Smith;Janis Green;;;29/12/1954 +Mrs Tester;;;;; +Tom Von Tester y tested;The Tester;Mrs Tester;;; +Fake von Person, I;The Tester;Mrs Tester;;;1954- +Mary Tester;The Tester;Mrs Tester;;; +Martha Tester;The Tester;Mrs Tester;;; +John Tester;The Tester;Mrs Tester;;; +Mark Tester;The Tester;Mrs Tester;;; diff --git a/data/tests/exp_sample_csv.csv b/data/tests/exp_sample_csv.csv index b58709cea..41ab20eb4 100644 --- a/data/tests/exp_sample_csv.csv +++ b/data/tests/exp_sample_csv.csv @@ -30,66 +30,65 @@ [P0014],"Denver, Denver Co., CO","Denver, Denver Co., CO",City,39.7392,104.9903 W,,[P0024], Person,Surname,Given,Call,Suffix,Prefix,Title,Gender,Birth date,Birth place,Birth source,Baptism date,Baptism place,Baptism source,Death date,Death place,Death source,Burial date,Burial place,Burial source,Note -[I0030],Adams,Janice Ann,,,,,female,26 Aug 1965,"Fremont, Alameda Co., CA",,,,,,,,,,, -[I0016],Anderson,Jennifer,,,,,female,5 Nov 1907,"Rønne, Bornholm, Denmark",,,,,29 May 1985,"San Francisco, San Francisco Co., CA",,,,, -[I0025],Ericsdotter,Marta,,,,,female,about 1775,Sweden,,,,,,,,,,, -[I0041],Green,Janis Elaine,,,,,female,2 Dec 1935,,,,,,,,,,,, -[I0000],Hansdotter,Anna,,,,,female,2 Oct 1864,"Löderup, Malmöhus Län, Sweden",,,,,29 Sep 1945,"Sparks, Washoe Co., NV",,,,, -[I0038],Hansdotter,Kerstina,,,,,female,29 Nov 1832,"Smestorp, Kristianstad Län, Sweden",,,,,before 1908,Sweden,,,,, -[I0032],Horne,Darcy,,,,,female,2 Jul 1966,"Sacramento, Sacramento Co., CA",,,,,,,,,,, -[I0036],Jefferson,Elna,,,,,female,14 Sep 1800,"Gladsax, Kristianstad Län, Sweden",,,,,,Sweden,,,,, -[I0017],Jones,Lillie Harriet,,,,,female,2 May 1910,"Rønne, Bornholm, Denmark",,,,,26 Jun 1990,,,,,, +[I0030],Adams,Janice Ann,,,,,female,1965-08-26,[P0013],,,,,,,,,,, +[I0016],Anderson,Jennifer,,,,,female,1907-11-05,[P0003],,,,,1985-05-29,[P0002],,,,, +[I0025],Ericsdotter,Marta,,,,,female,about 1775,[P0008],,,,,,,,,,, +[I0041],Green,Janis Elaine,,,,,female,1935-12-02,,,,,,,,,,,, +[I0000],Hansdotter,Anna,,,,,female,1864-10-02,[P0000],,,,,1945-09-29,[P0001],,,,, +[I0038],Hansdotter,Kerstina,,,,,female,1832-11-29,[P0019],,,,,before 1908,[P0008],,,,, +[I0032],Horne,Darcy,,,,,female,1966-07-02,[P0015],,,,,,,,,,, +[I0036],Jefferson,Elna,,,,,female,1800-09-14,[P0004],,,,,,[P0008],,,,, +[I0017],Jones,Lillie Harriet,,,,,female,1910-05-02,[P0003],,,,,1990-06-26,,,,,, [I0042],Ke 柯,雪,,,,,male,,,,,,,,,,,,, [I0013],Michaels,Evelyn,,,,,female,about 1897,,,,,,,,,,,, -[I0012],Nielsen,Herman Julius,,,,,male,31 Aug 1889,"Rønne, Bornholm, Denmark",,,,,1945,,,,,, -[I0031],Ohman,Marjorie,,,,,female,3 Jun 1903,"Denver, Denver Co., CO, Denver Co., Colorado, USA",,,,,22 Jun 1980,"Reno, Washoe Co., NV",,,,, -[I0034],Perkins,Alice Paula,,,,,female,22 Nov 1933,"Sparks, Washoe Co., NV",,,,,,,,,,, -[I0002],Smith,Amber Marie,,,,,female,12 Apr 1998,"Hayward, Alameda Co., CA",,,,,,,,,,, -[I0023],Smith,Astrid Shermanna Augusta,,,,,female,31 Jan 1889,"Rønne, Bornholm, Denmark",,,,,21 Dec 1963,"San Francisco, San Francisco Co., CA",,,,, -[I0020],Smith,Carl Emil,,,,,male,20 Dec 1899,"Rønne, Bornholm, Denmark",,,,,28 Jan 1959,"Reno, Washoe Co., NV",,,,, -[I0029],Smith,Craig Peter,,,,,male,after 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0037],Smith,Edwin Michael,,,,,male,24 May 1961,"San Jose, Santa Clara Co., CA","Birth, Death and Marriage Records",,,,,,,,,, -[I0009],Smith,Emil,,,,,male,27 Sep 1860,"Simrishamn, Kristianstad Län, Sweden",,,,,,,,,,, -[I0019],Smith,Eric Lloyd,,,,Dr.,male,28 Aug 1963,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0015],Smith,Gus,,,,,male,11 Sep 1897,"Rønne, Bornholm, Denmark",,,,,21 Oct 1963,"San Francisco, San Francisco Co., CA",,,,, -[I0024],Smith,Gustaf,,Sr.,,,male,28 Nov 1862,"Grostorp, Kristianstad Län, Sweden",,,,,before 23 Jul 1930,"Sparks, Washoe Co., NV",,,,, -[I0011],Smith,Hanna,,,,,female,29 Jan 1821,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,, -[I0010],Smith,Hans Peter,,,,,male,17 Apr 1904,"Rønne, Bornholm, Denmark",Birth Records,,,,29 Jan 1977,"San Francisco, San Francisco Co., CA",,5 Feb 1977,"San Francisco, San Francisco Co., CA",findagrave.com, -[I0021],Smith,Hjalmar,,,,,male,31 Jan 1893,"Rønne, Bornholm, Denmark",,,,,25 Sep 1894,"Rønne, Bornholm, Denmark",,,,, -[I0008],Smith,Hjalmar,,,,,male,7 Apr 1895,"Rønne, Bornholm, Denmark",,3 Jun 1895,"Rønne Bornholm, Denmark",,26 Jun 1975,"Reno, Washoe Co., NV",,,,, -[I0007],Smith,Ingar,,,,,female,after 1823,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,, -[I0027],Smith,Ingeman,,,,,male,about 1770,Sweden,,,,,,,,,,, -[I0004],Smith,Ingeman,,,,,male,29 Jan 1826,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,, -[I0018],Smith,John Hjalmar,,,,,male,30 Jan 1932,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0001],Smith,Keith Lloyd,,,,,male,11 Aug 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0026],Smith,Kirsti Marie,,,,,female,15 Dec 1886,"Rønne, Bornholm, Denmark",,,,,18 Jul 1966,"San Francisco, San Francisco Co., CA",,,,, -[I0035],Smith,Lars Peter,,,,,male,16 Sep 1991,"Santa Rosa, Sonoma Co., CA",,,,,,,,,,, -[I0033],Smith,Lloyd,,,,,male,13 Mar 1935,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0003],Smith,Magnes,,,,,male,6 Oct 1858,"Simrishamn, Kristianstad Län, Sweden",,,,,20 Feb 1910,"Rønne, Bornholm, Denmark",,,,, -[I0040],Smith,Marjorie Alice,,,,,female,5 Feb 1960,"San Jose, Santa Clara Co., CA",,,,,,,,,,, -[I0014],Smith,Marjorie Lee,,,,,female,4 Nov 1934,"Reno, Washoe Co., NV",,,,,,,,,,, -[I0022],Smith,Martin,,,,,male,19 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,23 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,between 1899 and 1905,Sweden,,,,, -[I0039],Smith,Martin,,,,,male,between 1794 and 1796,"Tommarp, Kristianstad Län, Sweden",,,,,,Sweden,,,,, -[I0005],Smith,Mason Michael,,,,,male,26 Jun 1996,"Hayward, Alameda Co., CA",,,,,,,,,,, -[I0028],Streiffert,Anna,,,,,female,23 Sep 1860,"Hoya/Jona/Hoia, Sweden",,,,,2 Feb 1927,"Rønne, Bornholm, Denmark",,,,, +[I0012],Nielsen,Herman Julius,,,,,male,1889-08-31,[P0003],,,,,1945,,,,,, +[I0031],Ohman,Marjorie,,,,,female,1903-06-03,[P0014],,,,,1980-06-22,[P0005],,,,, +[I0034],Perkins,Alice Paula,,,,,female,1933-11-22,[P0001],,,,,,,,,,, +[I0002],Smith,Amber Marie,,,,,female,1998-04-12,[P0006],,,,,,,,,,, +[I0023],Smith,Astrid Shermanna Augusta,,,,,female,1889-01-31,[P0003],,,,,1963-12-21,[P0002],,,,, +[I0020],Smith,Carl Emil,,,,,male,1899-12-20,[P0003],,,,,1959-01-28,[P0005],,,,, +[I0029],Smith,Craig Peter,,,,,male,after 1966,[P0002],,,,,,,,,,, +[I0037],Smith,Edwin Michael,,,,,male,1961-05-24,[P0017],"Birth, Death and Marriage Records",,,,,,,,,, +[I0009],Smith,Emil,,,,,male,1860-09-27,[P0012],,,,,,,,,,, +[I0019],Smith,Eric Lloyd,,,,Dr.,male,1963-08-28,[P0002],,,,,,,,,,, +[I0015],Smith,Gus,,,,,male,1897-09-11,[P0003],,,,,1963-10-21,[P0002],,,,, +[I0024],Smith,Gustaf,,Sr.,,,male,1862-11-28,[P0009],,,,,before 1930-07-23,[P0001],,,,, +[I0011],Smith,Hanna,,,,,female,1821-01-29,[P0004],,,,,,,,,,, +[I0010],Smith,Hans Peter,,,,,male,1904-04-17,[P0003],Birth Records,,,,1977-01-29,[P0002],,1977-02-05,[P0002],findagrave.com, +[I0021],Smith,Hjalmar,,,,,male,1893-01-31,[P0003],,,,,1894-09-25,[P0003],,,,, +[I0008],Smith,Hjalmar,,,,,male,1895-04-07,[P0003],,1895-06-03,[P0021],,1975-06-26,[P0005],,,,, +[I0007],Smith,Ingar,,,,,female,after 1823,[P0004],,,,,,,,,,, +[I0027],Smith,Ingeman,,,,,male,about 1770,[P0008],,,,,,,,,,, +[I0004],Smith,Ingeman,,,,,male,1826-01-29,[P0004],,,,,,,,,,, +[I0018],Smith,John Hjalmar,,,,,male,1932-01-30,[P0002],,,,,,,,,,, +[I0001],Smith,Keith Lloyd,,,,,male,1966-08-11,[P0002],,,,,,,,,,, +[I0026],Smith,Kirsti Marie,,,,,female,1886-12-15,[P0003],,,,,1966-07-18,[P0002],,,,, +[I0035],Smith,Lars Peter,,,,,male,1991-09-16,[P0016],,,,,,,,,,, +[I0033],Smith,Lloyd,,,,,male,1935-03-13,[P0002],,,,,,,,,,, +[I0003],Smith,Magnes,,,,,male,1858-10-06,[P0012],,,,,1910-02-20,[P0003],,,,, +[I0040],Smith,Marjorie Alice,,,,,female,1960-02-05,[P0017],,,,,,,,,,, +[I0014],Smith,Marjorie Lee,,,,,female,1934-11-04,[P0005],,,,,,,,,,, +[I0022],Smith,Martin,,,,,male,1830-11-19,[P0004],,1830-11-23,[P0004],,between 1899 and 1905,[P0008],,,,, +[I0039],Smith,Martin,,,,,male,between 1794 and 1796,[P0020],,,,,,[P0008],,,,, +[I0005],Smith,Mason Michael,,,,,male,1996-06-26,[P0006],,,,,,,,,,, +[I0028],Streiffert,Anna,,,,,female,1860-09-23,[P0011],,,,,1927-02-02,[P0003],,,,, [I0006],Willard,Edwin,,,,,male,about 1886,,,,,,,,,,,, -[I0043],リチミシキスイミ,ピーター,,,,,male,,,,,,,,,,,,, Marriage,Husband,Wife,Date,Place,Source,Note -[F0000],[I0039],[I0036],about 1816,"Gladsax, Kristianstad Län, Sweden",, -[F0001],[I0027],[I0025],about 1790,Sweden,, +[F0000],[I0039],[I0036],about 1816,[P0004],, +[F0001],[I0027],[I0025],about 1790,[P0008],, [F0002],[I0022],[I0038],about 1856,,, -[F0003],[I0024],[I0000],27 Nov 1885,"Rønne, Bornholm, Denmark",, +[F0003],[I0024],[I0000],1885-11-27,[P0003],, [F0004],[I0006],[I0026],about 1910,,, -[F0005],[I0012],[I0023],30 Nov 1912,"Rønne, Bornholm, Denmark",, -[F0006],[I0008],[I0031],31 Oct 1927,"Reno, Washoe Co., NV",, +[F0005],[I0012],[I0023],1912-11-30,[P0003],, +[F0006],[I0008],[I0031],1927-10-31,[P0005],, [F0007],[I0015],[I0013],about 1920,,, -[F0008],[I0033],[I0041],10 Aug 1958,"San Francisco, San Francisco Co., CA",, +[F0008],[I0033],[I0041],1958-08-10,[P0002],, [F0009],[I0010],[I0017],,,, -[F0010],[I0019],[I0032],12 Jul 1986,"Woodland, Yolo Co., CA",, -[F0011],[I0003],[I0028],24 Aug 1884,"Rønne, Bornholm, Denmark",, -[F0012],[I0018],[I0034],4 Jun 1954,"Sparks, Washoe Co., NV",Marriage Certificae, -[F0013],[I0037],[I0030],27 May 1995,"San Ramon, Conta Costa Co., CA",, +[F0010],[I0019],[I0032],1986-07-12,[P0022],, +[F0011],[I0003],[I0028],1884-08-24,[P0003],, +[F0012],[I0018],[I0034],1954-06-04,[P0001],Marriage Certificae, +[F0013],[I0037],[I0030],1995-05-27,[P0023],, [F0014],[I0010],[I0016],,,, Family,Child diff --git a/gramps/plugins/export/exportftree.py b/gramps/plugins/export/exportftree.py index a42133892..455e32015 100644 --- a/gramps/plugins/export/exportftree.py +++ b/gramps/plugins/export/exportftree.py @@ -82,7 +82,8 @@ class FtreeWriter: self.option_box.parse_options() self.db = option_box.get_filtered_database(self.db) - self.plist = [x for x in self.db.iter_person_handles()] + self.plist = self.db.get_person_handles() + self.plist.sort() # the following are used to update the progress meter self.total = 2 * len(self.plist) self.count = 0 diff --git a/gramps/plugins/export/exportgeneweb.py b/gramps/plugins/export/exportgeneweb.py index c69d9056a..ee54686b6 100644 --- a/gramps/plugins/export/exportgeneweb.py +++ b/gramps/plugins/export/exportgeneweb.py @@ -91,7 +91,8 @@ class GeneWebWriter: self.dirname = os.path.dirname (self.filename) try: with open(self.filename, "wb") as self.g: - self.flist = [x for x in self.db.iter_family_handles()] + self.flist = self.db.get_family_handles() + self.flist.sort() if len(self.flist) < 1: self.user.notify_error(_("No families matched by selected filter")) return False diff --git a/gramps/plugins/export/exportvcalendar.py b/gramps/plugins/export/exportvcalendar.py index c80fb3d46..4c2d031f4 100644 --- a/gramps/plugins/export/exportvcalendar.py +++ b/gramps/plugins/export/exportvcalendar.py @@ -30,7 +30,7 @@ #------------------------------------------------------------------------- import os import sys -from time import localtime +import time #------------------------------------------------------------------------ # @@ -51,10 +51,10 @@ _ = glocale.translation.gettext from gramps.gui.plug.export import WriterOptionBox from gramps.gen.utils.db import family_name from gramps.gen.lib import Date, EventType -from gramps.gui.glade import Glade from gramps.gen.display.name import displayer as name_displayer from gramps.gen.display.place import displayer as _pd + class CalendarWriter: def __init__(self, database, filename, user, option_box=None): self.db = database @@ -95,24 +95,27 @@ class CalendarWriter: def export_data(self, filename): - self.dirname = os.path.dirname (filename) + self.dirname = os.path.dirname(filename) try: - with open(filename,"w") as self.g: + with open(filename, "w", encoding='utf8', + newline='\r\n') as self.g: self.writeln("BEGIN:VCALENDAR") self.writeln("PRODID:-//GNU//Gramps//EN") - self.writeln("VERSION:1.0") + self.writeln("VERSION:2.0") - self.total = (len([x for x in self.db.iter_person_handles()]) + - len([x for x in self.db.iter_family_handles()])) - for key in self.db.iter_person_handles(): + p_hndls = self.db.get_person_handles() + p_hndls.sort() + f_hndls = self.db.get_family_handles() + f_hndls.sort() + self.total = len(p_hndls) + len(f_hndls) + for key in p_hndls: self.write_person(key) self.update() - for key in self.db.iter_family_handles(): + for key in f_hndls: self.write_family(key) self.update() - self.writeln("") self.writeln("END:VCALENDAR") return True @@ -129,16 +132,11 @@ class CalendarWriter: if family: for event_ref in family.get_event_ref_list(): event = self.db.get_event_from_handle(event_ref.ref) - if event.get_type() == EventType.MARRIAGE: - m_date = event.get_date_object() - place_handle = event.get_place_handle() + if event and event.get_type() == EventType.MARRIAGE: # feature requests 2356, 1657: avoid genitive form - text = "%s - %s" % (family_name(family, self.db), _("Marriage")) - if place_handle: - place_title = _pd.display_event(self.db, event) - self.write_vevent( text, m_date, place_title) - else: - self.write_vevent( text, m_date) + text = "%s - %s" % (family_name(family, self.db), + _("Marriage")) + self.write_vevent(text, event) def write_person(self, person_handle): person = self.db.get_person_from_handle(person_handle) @@ -147,45 +145,26 @@ class CalendarWriter: if birth_ref: birth = self.db.get_event_from_handle(birth_ref.ref) if birth: - b_date = birth.get_date_object() - place_handle = birth.get_place_handle() - if place_handle: - # feature requests 2356, 1657: avoid genitive form - place_title = _pd.display_event(self.db, birth) - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Birth")), - b_date, place_title) - else: - # feature requests 2356, 1657: avoid genitive form - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Birth")), - b_date) + # feature requests 2356, 1657: avoid genitive form + self.write_vevent("%s - %s" % + (name_displayer.display(person), + _("Birth")), birth) death_ref = person.get_death_ref() if death_ref: death = self.db.get_event_from_handle(death_ref.ref) if death: - d_date = death.get_date_object() - place_handle = death.get_place_handle() - if place_handle: - # feature requests 2356, 1657: avoid genitive form - place_title = _pd.display_event(self.db, death) - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Death")), - d_date, place_title) - else: - # feature requests 2356, 1657: avoid genitive form - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Death")), - d_date) - + # feature requests 2356, 1657: avoid genitive form + self.write_vevent("%s - %s" % + (name_displayer.display(person), + _("Death")), death) def format_single_date(self, subdate, thisyear, cal): retval = "" (day, month, year, sl) = subdate if thisyear: - year = localtime().tm_year + year = time.localtime().tm_year if not cal == Date.CAL_GREGORIAN: return "" @@ -196,7 +175,6 @@ class CalendarWriter: retval = "%s%02d%02d" % (year, month, day) return retval - def format_date(self, date, thisyear=0): retval = "" if date.get_modifier() == Date.MOD_TEXTONLY: @@ -220,23 +198,43 @@ class CalendarWriter: start) return retval - def write_vevent(self, event_text, date, location=""): + def write_vevent(self, event_text, event): + date = event.get_date_object() + place_handle = event.get_place_handle() date_string = self.format_date(date, 1) if date_string is not "": - self.writeln("") + # self.writeln("") self.writeln("BEGIN:VEVENT") - self.writeln("SUMMARY:%s %s" % (date.get_year(), event_text)) - if location: - self.writeln("LOCATION:%s" % location) + time_s = time.gmtime(event.change) + self.writeln("DTSTAMP:%04d%02d%02dT%02d%02d%02dZ" % time_s[0:6]) + self.writeln("UID:%s@gramps.com" % event.handle) + self.writeln(fold("SUMMARY:%s %s" % (date.get_year(), event_text))) + if place_handle: + location = _pd.display_event(self.db, event) + if location: + self.writeln("LOCATION:%s" % location) self.writeln("RRULE:FREQ=YEARLY") self.writeln(date_string) self.writeln("END:VEVENT") -#------------------------------------------------------------------------- -# -# -# -#------------------------------------------------------------------------- +# ------------------------------------------------------------------------- + + +def fold(txt): + """ Limit line length to 75 octets (per RFC 5545) """ + l_len = 0 + text = '' + for char in txt: + c_len = len(char.encode('utf8')) + if c_len + l_len > 75: + l_len = 1 + text += '\n ' + char + else: + l_len += c_len + text += char + return text + + def exportData(database, filename, user, option_box=None): cw = CalendarWriter(database, filename, user, option_box) return cw.export_data(filename) diff --git a/gramps/plugins/test/exports_test.py b/gramps/plugins/test/exports_test.py index dcda87d89..0a5cc39d7 100644 --- a/gramps/plugins/test/exports_test.py +++ b/gramps/plugins/test/exports_test.py @@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import unittest import os import difflib +from unittest.mock import patch +from time import localtime, strptime from gramps.test.test_util import Gramps from gramps.gen.const import TEMP_DIR, DATA_DIR @@ -33,6 +35,13 @@ TREE_NAME = "Test_exporttest" TEST_DIR = os.path.abspath(os.path.join(DATA_DIR, "tests")) +def mock_localtime(*args): + """ + Mock up a dummy to replace the varying 'time string results' + """ + return strptime("25 Dec 1999", "%d %b %Y") + + def call(*args): """ Call Gramps to perform the action with out and err captured """ #print("call:", args) @@ -84,6 +93,8 @@ def compare(expect_file, result_file, dfilter=None): msg += line if dfilter: fail += dfilter(line) + else: + fail = True return msg if fail else "" @@ -184,6 +195,9 @@ class ExportControl(unittest.TestCase): export dates, file names etc. that don't count as differences. """ def setUp(self): + config.set('behavior.date-before-range', 50) + config.set('behavior.date-after-range', 50) + config.set('behavior.date-about-range', 10) self.tearDown() # removes it if it existed # out, err = self.call("-C", TREE_NAME, @@ -195,6 +209,17 @@ class ExportControl(unittest.TestCase): def test_csv(self): """ Run a csv export test """ set_format(0) # Use ISO date for test + config.set('database.backend', 'bsddb') + src_file = 'exp_sample_csv.gramps' + tst_file = 'exp_sample_csv.csv' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_csv_sq(self): + """ Run a csv export test """ + set_format(0) # Use ISO date for test + config.set('database.backend', 'sqlite') src_file = 'exp_sample_csv.gramps' tst_file = 'exp_sample_csv.csv' msg = do_it(src_file, tst_file) @@ -204,6 +229,17 @@ class ExportControl(unittest.TestCase): def test_ged(self): """ Run a Gedcom export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample_ged.ged' + msg = do_it(src_file, tst_file, gedfilt) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_ged_sq(self): + """ Run a Gedcom export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample_ged.ged' msg = do_it(src_file, tst_file, gedfilt) @@ -213,15 +249,39 @@ class ExportControl(unittest.TestCase): def test_vcard(self): """ Run a vcard export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.vcf' msg = do_it(src_file, tst_file, vcffilt) if msg: self.fail(tst_file + ': ' + msg) + def test_vcard_sq(self): + """ Run a vcard export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.vcf' + msg = do_it(src_file, tst_file, vcffilt) + if msg: + self.fail(tst_file + ': ' + msg) + + @patch('gramps.plugins.export.exportvcalendar.time.localtime', mock_localtime) def test_vcs(self): """ Run a Vcalandar export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.vcs' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + @patch('gramps.plugins.export.exportvcalendar.time.localtime', mock_localtime) + def test_vcs_sq(self): + """ Run a Vcalandar export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.vcs' msg = do_it(src_file, tst_file) @@ -231,6 +291,17 @@ class ExportControl(unittest.TestCase): def test_gw(self): """ Run a Geneweb export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.gw' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_gw_sq(self): + """ Run a Geneweb export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.gw' msg = do_it(src_file, tst_file) @@ -241,6 +312,18 @@ class ExportControl(unittest.TestCase): """ Run a Web Family Tree export test """ set_format(0) # Use ISO date for test config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.wft' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_wft_sq(self): + """ Run a Web Family Tree export test """ + set_format(0) # Use ISO date for test + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.wft' msg = do_it(src_file, tst_file)