diff --git a/data/tests/imp_PhonFax_dfs.ged b/data/tests/imp_PhonFax_dfs.ged index 05b81b2ba..b86fc2d09 100644 --- a/data/tests/imp_PhonFax_dfs.ged +++ b/data/tests/imp_PhonFax_dfs.ged @@ -10,14 +10,20 @@ 3 FAX (801) 705-7001 3 EMAIL help@ancestry.com 3 WWW http://www.ancestry.com +2 DATA FTM Source data +3 COPR Copyright 2999 +2 DATE 1 JAN 1111 1 DEST GED55 1 DATE 01 MAR 2016 1 CHAR UTF-8 +1 CHAR UTF-8 +2 VERS 1.1 1 FILE D:\Family Tree Maker\imp_FTM_LINK.ged 1 SUBM @SUBM@ +2 NAME The Tester 1 GEDC 2 VERS 5.5 -2 FORM LINEAGE-LINKED +2 FORM Lineage-Linked 0 @SUBM@ SUBM 1 NAME The Subm /Tester/ 1 ADDR 123 Main St., Winslow, PA, 12345 diff --git a/data/tests/imp_PhonFax_dfs.gramps b/data/tests/imp_PhonFax_dfs.gramps index debc342e0..03e4d881e 100644 --- a/data/tests/imp_PhonFax_dfs.gramps +++ b/data/tests/imp_PhonFax_dfs.gramps @@ -3,7 +3,7 @@ "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
- + The Subm /Tester/ 123 Main St. @@ -14,28 +14,31 @@ mrstester@gmail.com
+ + + - + Birth - + - + Residence - + - + - + Residence @@ -45,22 +48,23 @@ - + U The Tester - - + + + - + U Mrs Tester - +
123 Main St. Winslow @@ -72,85 +76,91 @@ - - + + + - + U Tom Tester - - + + + - + 2 - + 2 - + 2 - + Import from imp_FTM_LINK.ged + The Tester + + + - + - + - + Ohio Births, 1958-2002 - + - + 123 High St, Cleveland, Cuyahoga, Ohio, USA, 44140 44140 - + - + 123 Main St., Winslow, PA, 12345 - + USA - + Ohio, USA - - - - Cuyahoga, Ohio, USA - - + + Cuyahoga, Ohio, USA + + + + Cleveland, Cuyahoga, Ohio, USA - + - + Business that produced the product: Ancestry.com GEDCOM data
@@ -161,7 +171,7 @@ - + SUBM (Submitter): (@SUBM@) The Subm /Tester/ GEDCOM data
@@ -174,9 +184,9 @@ - + - + Testers Repository Library
@@ -186,40 +196,45 @@ - + - + Records not imported into HEAD (header): -Only one phone number supported Line 9: 3 PHON (800) 705-7000 +Only one phone number supported Line 9: 3 PHON (800) 705-7000 +Line ignored as not understood Line 15: 2 DATE 1111-01-01 +GEDCOM FORM should be in uppercase Line 26: 2 FORM Lineage-Linked - + Records not imported into SUBM (Submitter): (@SUBM@) The Subm /Tester/: -Only one phone number supported Line 29: 1 PHON 800-871-3401 +Only one phone number supported Line 35: 1 PHON 800-871-3401 - + Address with PHON,FAX,EMAIL,WWW. attached directly to person is not legal Gedcom, but allowed here. + - + Address as event is legal, with PHON,FAX,EMAIL,WWW + - + The repository record + - + Records not imported into REPO (repository) Gramps ID R0002: -Only one phone number supported Line 87: 1 PHON 800-765-4321 +Only one phone number supported Line 93: 1 PHON 800-765-4321 diff --git a/data/tests/imp_notetest_dfs.gramps b/data/tests/imp_notetest_dfs.gramps index 07927735d..bbc58ec99 100644 --- a/data/tests/imp_notetest_dfs.gramps +++ b/data/tests/imp_notetest_dfs.gramps @@ -3,182 +3,190 @@ "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
- + John A. Tester
+ + + - + TEST person - + Birth - - + + - + Death - + - + Who knows OBJE REFN TYPE REFN - + Birth - + Death - + Birth - + Death - + TEST family - + M Tom Tester - - - - + + + + - - + - - + + + + - + F Mrs Tester - - - - - + + + + + + - + M Ed Tester Eddie - + - + - - - - + + + + - - - + + + - - + + + - + U George Testee - + - + + - + - - - - - + + + + - - - + + + + + - + 2 - + 2 - + 2 - + 2 - + - + 2 - + 2 - + 2 - + - + 42 0 - - + + - + Import from imp_notetest.ged Tom Tester 2016 - + @@ -192,71 +200,72 @@ - + - + @SOURCE1@ - + Note Test file Source: Tester - - - + + + - + 123 main, Norwalk, Ohio, USA - + - + Salt Lake City - + - + - - + + + - + Business that produced the product: RSAC Software GEDCOM data - + SUBM (Submitter): (@SUBMITTER@) John A. Tester GEDCOM data
- - + + - + The Testers repository Library - + - + Header note - + Records not imported into HEAD (header): Line ignored as not understood Line 18: 2 TEST Header Note @@ -266,13 +275,14 @@ Skipped subordinate line Line 20: - + Submission Note + - + Submission xref note - + Records not imported into Top Level: Line ignored as not understood Line 26: 2 TEST Submission Note @@ -283,7 +293,7 @@ Line ignored as not understood Line 29: - + Records not imported into NOTE Gramps ID N0003: Tag recognized but not supported Line 32: 1 RIN Submission Note RIN @@ -295,13 +305,14 @@ Line ignored as not understood Line 39: - + Submitter Note + - + Submitter xref note - + Records not imported into SUBM (Submitter): (@SUBMITTER@) John A. Tester: Line ignored as not understood Line 43: 2 TEST Submitter Note @@ -312,37 +323,44 @@ Line ignored as not understood Line 46: - + Birth Event note + - + Location Note + - + Location Note 2 + - + Death Event xref note - + FAMS Note + - + FAMS Note 2 + - + Tom Tester xref note - + Tom Tester Note + - + Media Note + - + Media xref note - + Records not imported into INDI (individual) Gramps ID I0001: Empty note ignored Line 54: 2 NOTE @@ -369,7 +387,7 @@ Skipped subordinate line Line 91: - + Records not imported into NOTE Gramps ID N0018: Tag recognized but not supported Line 103: 1 RIN 123456 @@ -383,10 +401,10 @@ Skipped subordinate line Line 112: - + Who knows REFN TYPE - + Records not imported into OBJE (multi-media object) Gramps ID M1: Could not import photo.jpg Line 114: 1 FILE photo.jpg @@ -394,10 +412,11 @@ Could not import photo.jpg Line 114: - + Family Spouse reference Note + - + Records not imported into INDI (individual) Gramps ID I0002: Empty note ignored Line 132: 2 NOTE @@ -406,19 +425,22 @@ Skipped subordinate line Line 133: - + Name note + - + Place note + - + LDS xref note - + Association link note + - + Records not imported into INDI (individual) Gramps ID I0003: Empty note ignored Line 141: 2 NOTE @@ -430,25 +452,29 @@ Skipped subordinate line Line 168: - + Just for association + - + Family xref note - + Family note + - + Citation Data Note + - + A sample text from a source of this family - + A note this citation is on the FAMILY record. + - + Records not imported into FAM (family) Gramps ID F0001: Line ignored as not understood Line 183: 2 TEST Family Note @@ -461,13 +487,15 @@ Line ignored as not understood Line 196: - + A short note about the repository link. + - + note embedded in the SOURCE Record + - + Records not imported into SOUR (source) Gramps ID S0001: Line ignored as not understood Line 206: 1 TEST source @@ -479,10 +507,11 @@ Skipped subordinate line Line 215: - + Repository Note + - + Records not imported into REPO (repository) Gramps ID R0002: Line ignored as not understood Line 223: 1 TEST Repo diff --git a/data/tests/imp_sample.ged b/data/tests/imp_sample.ged index 459f08241..cf534864c 100644 --- a/data/tests/imp_sample.ged +++ b/data/tests/imp_sample.ged @@ -1,31 +1,65 @@ 0 HEAD -1 SOUR Gramps +1 SOUR LEGACY 2 VERS 3.3.0 -2 NAME Gramps +2 NAME LEGACY 1 DATE 27 DEC 2010 2 TIME 15:35:24 1 SUBM @SUBM@ -1 FILE gramps33/example/gedcom/sample.ged +1 SUBN @SUBN@ +1 FILE sample.ged 1 COPR Copyright (c) 2010 Alex Roitman,,,. 1 GEDC 2 VERS 5.5 2 FORM LINEAGE-LINKED +2 FORM NOT LINEAGE-LINKED 1 CHAR UTF-8 +2 VERS 1.1 1 LANG French 0 @SUBM@ SUBM 1 NAME Alex Roitman,,, 1 ADDR Not Provided 2 CONT Not Provided 2 ADR1 Not Provided +2 NOTE No address provided (note not supported) +0 @SUBN@ SUBN +1 TEMP Mormon Temple +1 ANCE 4 +1 DESC 4 +1 ORDI Yes +0 @F3@ FAM +1 HUSB @I24@ +1 WIFE @I0@ +1 MARR +2 TYPE Marriage of Gustaf Smith, Sr. and Anna Hansdotter +2 DATE 27 NOV 1885 +2 PLAC Rønne, Bornholm, Denmark +1 CHIL @I26@ +1 CHIL @I23@ +1 CHIL @I21@ +1 CHIL @I8@ +1 CHIL @I15@ +1 CHIL @I20@ +1 CHIL @I10@ +1 CHAN +2 DATE 21 DEC 2007 +3 TIME 01:35 +2 SOUR Not really allowed here +1 RIN 987456321 +1 OBJE +2 TITL No filename for this one 0 @I0@ INDI 1 NAME Anna /Hansdotter/ 2 GIVN Anna 2 SURN Hansdotter +2 SPFX Vrow +2 SURN Smith +2 _AKA Anna Smith +2 _AKA Hanna 2 NOTE Hans daughter? N0000 1 SEX F 1 BIRT 2 TYPE Birth of Anna Hansdotter -2 DATE 2 OCT 1864 +2 DATE EST 2 OCT 1864 2 PLAC Löderup, Malmöhus Län, Sweden 1 DEAT 2 TYPE Death of Anna Hansdotter @@ -34,9 +68,10 @@ 2 NOTE Her eulogy was great! N0001 1 FAMS @F3@ 1 CHAN -2 DATE 21 DEC 2007 +2 DATE 21 DEC 1900 3 TIME 01:35:26 1 NOTE Inline note should get ID N0002 +1 _PHOTO @M1@ 0 @I1@ INDI 1 NAME Keith Lloyd /Smith/ 2 GIVN Keith Lloyd @@ -120,6 +155,8 @@ 1 NAME Marjorie Lee /Smith/ 2 GIVN Marjorie Lee 2 SURN Smith +1 NAME Margie +2 TYPE Nickname 1 SEX F 1 BIRT 2 TYPE Birth of Marjorie Lee Smith @@ -160,6 +197,16 @@ 2 TYPE Death of Jennifer Anderson 2 DATE 29 MAY 1985 2 PLAC San Francisco, San Francisco Co., CA +1 RESI +2 DATE 1980 +2 ADDR 459 Main St., The Village, San Francisco, CA, USA +3 ADR1 456 Main St +3 ADR1 456 Main St again +3 ADR2 The Village +3 CITY San Francisco +3 CTRY USA +3 PHON 555-666-7777 +3 STAE CA 1 FAMS @F14@ 1 CHAN 2 DATE 21 DEC 2007 @@ -194,6 +241,11 @@ 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 +1 SSN 987-555-4444 +2 TYPE first generaton +2 SOUR @S999@ +3 PAGE SSN docs pg 999 +2 NOTE Person Attribute Note on SSN 0 @I19@ INDI 1 NAME Eric Lloyd /Smith/ 2 GIVN Eric Lloyd @@ -354,6 +406,9 @@ 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 +1 ASSO @I23@ +2 RELA Friend +2 SOUR @S2@ 0 @I25@ INDI 1 NAME Marta /Ericsdotter/ 2 GIVN Marta @@ -371,10 +426,13 @@ 1 FACT Housekeeper 2 TYPE Skills 1 CONL +2 TEMP STOCK code 2 DATE 1790 1 ENDL +2 TEMP Stockholm 2 DATE 1795 1 SLGC +2 TEMP Stockholm, Sweden 2 DATE 1796 2 PLAC Sweden 3 FORM Country @@ -404,7 +462,7 @@ 1 SEX M 1 BIRT 2 TYPE Birth of Ingeman Smith -2 DATE ABT 1770 +2 DATE ABT @#DGREGORIAN@ 1770 2 PLAC Sweden 1 FAMS @F1@ 1 CHAN @@ -447,11 +505,13 @@ 1 NAME Magnes /Smith/ 2 GIVN Magnes 2 SURN Smith -1 SEX M +1 SSN 987-654-3210 +1 SEX X 1 BIRT 2 TYPE Birth of Magnes Smith 2 DATE 6 OCT 1858 2 PLAC Simrishamn, Kristianstad Län, Sweden +2 RIN 789654123 1 DEAT 2 TYPE Death of Magnes Smith 2 DATE 20 FEB 1910 @@ -470,6 +530,8 @@ 2 TYPE Birth of Janice Ann Adams 2 DATE 26 AUG 1965 2 PLAC Fremont, Alameda Co., CA +2 CAUS fooling around +3 SOUR @S0@ 1 OCCU Retail Manager 1 _DEG 2 TYPE Business Management @@ -539,6 +601,8 @@ 1 NAME Lars Peter /Smith/ 2 GIVN Lars Peter 2 SURN Smith +2 _ADPN Jones +2 _ADPN Pete Jones 1 SEX M 1 BIRT 2 TYPE Birth of Lars Peter Smith @@ -694,7 +758,7 @@ 1 SEX M 1 BIRT 2 TYPE Birth of Edwin Willard -2 DATE ABT 1886 +2 DATE BET @#DHEBREW@ AAV 1886 AND @#DHEBREW@ ELUL 1897 1 FAMS @F4@ 1 CHAN 2 DATE 21 DEC 2007 @@ -752,12 +816,19 @@ 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 +1 RESI At the boarding school +2 DATE FROM @#DGREGORIAN@ 1873 TO 1878 +2 PLAC Oronoko, Berrien, Michigan, USA +1 RESI At the hebrew boarding school +2 DATE FROM 1873 TO @#DHEBREW@ 1878 +2 PLAC Shemps +3 FORM home 0 @F0@ FAM 1 HUSB @I39@ 1 WIFE @I36@ 1 MARR 2 TYPE Marriage of Martin Smith and Elna Jefferson -2 DATE ABT 1816 +2 DATE BET @#DGREGORIAN@ 1816 AND 1817 2 PLAC Gladsax, Kristianstad Län, Sweden 1 CHIL @I11@ 1 CHIL @I7@ @@ -771,8 +842,12 @@ 1 WIFE @I25@ 1 MARR 2 TYPE Marriage of Ingeman Smith and Marta Ericsdotter -2 DATE ABT 1790 +2 DATE BET 1789 AND @#DHEBREW@ 1790 2 PLAC Sweden +2 HUSB +3 AGE 17 +2 WIFE +3 AGE 18 1 CHIL @I39@ 1 CHAN 2 DATE 21 DEC 2007 @@ -785,6 +860,7 @@ 2 DATE 12 JUL 1986 2 PLAC Woodland, Yolo Co., CA 1 CHIL @I35@ +2 _STAT 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 @@ -858,35 +934,20 @@ 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 +1 EVEN Common law marriage +2 TYPE Civil 0 @F2@ FAM 1 HUSB @I22@ 1 WIFE @I38@ 1 MARR 2 TYPE Marriage of Martin Smith and Kerstina Hansdotter -2 DATE ABT 1856 +2 DATE FROM @#DGREGORIAN@ 1856 TO @#DGREGORIAN@ 1857 1 CHIL @I3@ 1 CHIL @I9@ 1 CHIL @I24@ 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 -0 @F3@ FAM -1 HUSB @I24@ -1 WIFE @I0@ -1 MARR -2 TYPE Marriage of Gustaf Smith, Sr. and Anna Hansdotter -2 DATE 27 NOV 1885 -2 PLAC Rønne, Bornholm, Denmark -1 CHIL @I26@ -1 CHIL @I23@ -1 CHIL @I21@ -1 CHIL @I8@ -1 CHIL @I15@ -1 CHIL @I20@ -1 CHIL @I10@ -1 CHAN -2 DATE 21 DEC 2007 -3 TIME 01:35:26 0 @F4@ FAM 1 HUSB @I6@ 1 WIFE @I26@ @@ -921,7 +982,7 @@ 0 @F7@ FAM 1 HUSB @I15@ 1 WIFE @I13@ -1 MARR +1 MARR Civil Union 2 TYPE Marriage of Gus Smith and Evelyn Michaels 2 DATE ABT 1920 1 CHAN @@ -937,12 +998,15 @@ 1 CHIL @I19@ 1 CHIL @I1@ 1 CHIL @I29@ +2 ADOP 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 +1 ADDR 123 Main st, Grantville, Virginia, USA 0 @F9@ FAM 1 HUSB @I10@ 1 WIFE @I17@ +1 MARR Unmarried 1 CHIL @I33@ 1 CHAN 2 DATE 21 DEC 2007 @@ -977,9 +1041,15 @@ 2 CALN CA-123-LL-456_Num/ber 3 MEDI Film 1 NOTE @N0005@ +1 ABBR goodstuff +1 DATA +2 AGNC NYC Public Library 1 CHAN 2 DATE 21 DEC 2007 3 TIME 01:35:26 +0 @S4@ SOUR +1 PERI Our Family Tree +1 RIN 987456321 0 @R0002@ REPO 1 NAME New York Public Library 1 ADDR 5th Ave at 42 street @@ -988,13 +1058,27 @@ 2 STAE New York 2 POST 11111 2 CTRY USA +1 CHAN +2 DATE 01 JAN 2000 +3 TIME 00:00:00 0 @R0003@ REPO 1 NAME Aunt Martha's Attic -1 ADDR 123 Main St +1 ADDR 123 Main St, Someville, ST, USA 2 ADR1 123 Main St +2 ADR2 LittleVillage 2 CITY Someville 2 STAE ST 2 CTRY USA +2 DATE 25 DEC 1971 +2 SOUR @S0@ +3 DATE 26 DEC 1971 +3 REFN blah blah +4 TYPE who knows +3 EVEN housecleaning +4 ROLE sorter +3 OBJE +4 FILE Attic_photo.jpg +2 NOTE A note on this address 1 WWW http://library.gramps-project.org 1 NOTE @N0006@ 0 @N0000@ NOTE Witness name: John Doe @@ -1019,5 +1103,10 @@ 0 @N0004@ NOTE But Aunt Martha still keeps the original! 0 @N0005@ NOTE The repository reference from the source is important 0 @N0006@ NOTE Some note on the repo -0 @N7@ NOTE 'Smith': a very common name +0 XXX an unknown token at level 0 +0 SUBM @SUBM@ +0 @S4@ SOUR A weird source (one line) format +1 @X1@ XXX and unknown token xref definition 0 TRLR + +The end diff --git a/data/tests/imp_sample.gramps b/data/tests/imp_sample.gramps index da8dbd302..db2cc534f 100644 --- a/data/tests/imp_sample.gramps +++ b/data/tests/imp_sample.gramps @@ -3,754 +3,645 @@ "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
- + Alex Roitman,,, Not Provided
- + + Marriage + + + Marriage of Gustaf Smith, Sr. and Anna Hansdotter + + Birth - - + + Birth of Anna Hansdotter - + Death - + Death of Anna Hansdotter - + - + Birth - + Birth of Keith Lloyd Smith - + Birth - + Birth of Hans Peter Smith - + Death - + Death of Hans Peter Smith - + Birth - + Birth of Hanna Smith - + Birth - + Birth of Herman Julius Nielsen - + Death Death of Herman Julius Nielsen - + Birth Birth of Evelyn Michaels - + Birth - + Birth of Marjorie Lee Smith - + Birth - + Birth of Gus Smith - + Death - + Death of Gus Smith - + Birth - + Birth of Jennifer Anderson - + Death - + Death of Jennifer Anderson - + + Residence + + + + Birth - + Birth of Lillie Harriet Jones - + Death Death of Lillie Harriet Jones - + Birth - + Birth of John Hjalmar Smith - + Birth - + Birth of Eric Lloyd Smith - + Adopted - + Birth - + Birth of Amber Marie Smith - + Christening - + Christening of Amber Marie Smith - + Birth - + Birth of Carl Emil Smith - + Death - + Death of Carl Emil Smith - + Birth - + Birth of Hjalmar Smith - + Birth - + Death - + Death of Hjalmar Smith - + Death - + Nobility Title - + Sir Jimmy Smith - + Birth - + Birth of Martin Smith - + Death - + Death of Martin Smith - + Baptism - + Baptism of Martin Smith - + DATE 2007-12-21 - + Birth - + Birth of Astrid Shermanna Augusta Smith - + Death - + Death of Astrid Shermanna Augusta Smith - + Birth - + Birth of Gustaf Smith, Sr. - + Death - + Death of Gustaf Smith, Sr. - + Immi - + - + Christening - + Christening of Gustaf Smith, Sr. - + Birth - + Birth of Marta Ericsdotter - + Birth - + Birth of Kirsti Marie Smith - + Death - + Death of Kirsti Marie Smith - + Birth - + Birth of Ingeman Smith - + Birth - + Birth of Anna Streiffert - + Death - + Death of Anna Streiffert - + Birth - + Birth of Craig Peter Smith - + Census Census of Craig Peter Smith - + - + Birth - + Birth of Magnes Smith + - + Death - + Death of Magnes Smith - + Birth - + Birth of Janice Ann Adams + + + - + Occupation Retail Manager - + Degree Business Management - + Birth - + Birth of Marjorie Ohman - + Death - + Death of Marjorie Ohman - + Birth - + Birth of Darcy Horne - + Birth - + Birth of Lloyd Smith - + Birth - + Birth of Alice Paula Perkins - + Birth - + Birth of Lars Peter Smith - + Adopted - + Birth - + Birth of Elna Jefferson - + Death - + Death of Elna Jefferson - + Christening - + Christening of Elna Jefferson - + Birth - + Birth of Edwin Michael Smith - + - + Occupation Software Engineer - + - + Education - + Education of Edwin Michael Smith - + Degree B.S.E.E. - + Birth - + Birth of Kerstina Hansdotter - + Death - + Death of Kerstina Hansdotter - + Birth - + Birth of Martin Smith - + Death - + Death of Martin Smith - + Birth - + Birth of Ingeman Smith - + Birth - + Birth of Marjorie Alice Smith - + Birth Birth of Janis Elaine Green - + Birth - + Birth of Mason Michael Smith - + Christening - + Christening of Mason Michael Smith - + Birth - + Birth of Edwin Willard - + Birth - + Birth of Ingar Smith - + Birth - + Birth of Hjalmar Smith - + Death - + Death of Hjalmar Smith - + Baptism - + Baptism of Hjalmar Smith - + Immi - + - + Birth - + Birth of Emil Smith - + + Residence + + + At the boarding school + + + Residence + + + At the hebrew boarding school + + Marriage - - + + Marriage of Martin Smith and Elna Jefferson - + Marriage - - + + Marriage of Ingeman Smith and Marta Ericsdotter - + Marriage - + Marriage of Eric Lloyd Smith and Darcy Horne - + Marriage - + Marriage of Magnes Smith and Anna Streiffert - + - + Marriage Banns Celebration - + Marriage - + Marriage of John Hjalmar Smith and Alice Paula Perkins - + - + Marriage - + Marriage of Edwin Michael Smith and Janice Ann Adams - + Engagement - + Engagement of Edwin Michael Smith and Janice Ann Adams - + + Civil + Common law marriage + + Marriage - + Marriage of Martin Smith and Kerstina Hansdotter - - Marriage - - - Marriage of Gustaf Smith, Sr. and Anna Hansdotter - - + Marriage Marriage of Edwin Willard and Kirsti Marie Smith - + Marriage - + Marriage of Herman Julius Nielsen and Astrid Shermanna Augusta Smith - + Marriage - + Marriage of Hjalmar Smith and Marjorie Ohman - + Marriage Marriage of Gus Smith and Evelyn Michaels - + Marriage - + Marriage of Lloyd Smith and Janis Elaine Green + + Marriage + - + + M + + Gustaf + Smith + Sr. + + + + + + + + + + + + + + F Anna - Hansdotter - - - - - - - - - M - - Keith Lloyd - Smith - - - - - - - - M - - Hans Peter - Smith - - - - - - - - - - F - - Hanna - Smith - - - - - - - M - - Herman Julius - Nielsen - - - - - - - - F - - Evelyn - Michaels - - - - - - - F - - Marjorie Lee - Smith - - - - - - M - - Gus - Smith - - - - - - - - F - - Jennifer - Anderson - - - - - - - F - - Lillie Harriet - Jones - - - - - - - M - - John Hjalmar - Smith - - - - - - - - M - - Eric Lloyd - Smith - - - - - - - - F - - Amber Marie - Smith - - - - - - - M - - Carl Emil - Smith - - - - - - - M - - Hjalmar - Smith + Smith + - James + Anna Smith - - Jimmy Smith - - - - - - - - + + + + + + - - M + + F - Martin + Kirsti Marie Smith - - - - - - - - + + + + - + F Astrid Shermanna @@ -766,28 +657,209 @@ Smith Dr. - - - - + + + + - + M - Gustaf + Hjalmar Smith - Sr. + + + James + Smith + + + Jimmy Smith + - - - - + + - + + M + + Hjalmar + Smith + + + + + + + + + + + M + + Gus + Smith + + + + + + + + M + + Carl Emil + Smith + + + + + + + M + + Hans Peter + Smith + + + + + + + + + + M + + Keith Lloyd + Smith + + + + + + + + F + + Hanna + Smith + + + + + + + M + + Herman Julius + Nielsen + + + + + + + + F + + Evelyn + Michaels + + + + + + + F + + Marjorie Lee + Smith + + + Margie + + + + + + F + + Jennifer + Anderson + + + + + + + + + F + + Lillie Harriet + Jones + + + + + + + M + + John Hjalmar + Smith + + + + + + + + + + + + + M + + Eric Lloyd + Smith + + + + + + + + F + + Amber Marie + Smith + + + + + + + M + + Martin + Smith + + + + + + + + + + + F Marta @@ -797,550 +869,604 @@ Marta Smith - + + + - - + + + - + - - F - - Kirsti Marie - Smith - - - - - - - + M Ingeman Smith - - + + - + F Anna Streiffert - - - + + + - + M Craig Peter Smith - - - + + + - - M + + U Magnes Smith - - - - + + + + + - + F Janice Ann Adams - - - - + + + + - + F Marjorie Ohman - - - + + + - + F Darcy Horne - - + + - + M Lloyd Smith - - - + + + - + F Alice Paula Perkins - - + + - + M Lars Peter Smith - - - + + Lars Peter + Jones + + + Pete Jones + + + + - + F Elna Jefferson - - - - + + + + - + M Edwin Michael Smith - + - - + + - - - - + + + + - + F Kerstina Hansdotter - - - + + + - + M Martin Smith - - - - + + + + - + M Ingeman Smith - - + + - + F Marjorie Alice Smith - - + + - + F Janis Elaine Green - - + + - + M Mason Michael Smith - - - + + + - + M Edwin Willard - - + + - + F Ingar Smith - - + + - - M - - Hjalmar - Smith - - - - - - - - - - + M Emil Smith - - + + + + - + - - - - - - - - - - - - - - - - - + + + + + + - + + + + + + - + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + SSN docs pg 999 2 - + - + 2 - - + - + 2 - + - + 2 - + - + 2 - + + + + + 2 + + + + 2 + + + + 2 + + + + + 2 + + + + - + + @S999@ + + Birth Records - - + + - + + @S0@ + + + + Birth Certificate - - - + + + - + Birth, Death and Marriage Records - - + goodstuff + + + - - Marriage Certificae - - + + No title - ID S0004 + + + + A weird source (one line) format - + + Rønne, Bornholm, Denmark + + + + + Löderup, Malmöhus Län, Sweden - + Sparks, Washoe Co., NV - + San Francisco, San Francisco Co., CA - - Rønne, Bornholm, Denmark - - - - - + Gladsax, Kristianstad Län, Sweden - + Reno, Washoe Co., NV - + + 456 Main St again, The Village, San Francisco, CA, USA + + + + Hayward, Alameda Co., CA - + Community Presbyterian Church, Danville, CA - + Sweden - + Grostorp, Kristianstad Län, Sweden - + Copenhagen, Denmark - + Sweden - + Hoya/Jona/Hoia, Sweden - + Simrishamn, Kristianstad Län, Sweden - + Fremont, Alameda Co., CA - + Denver, Denver Co., CO - + Sacramento, Sacramento Co., CA - + Santa Rosa, Sonoma Co., CA - + San Jose, Santa Clara Co., CA - + UC Berkeley - + Smestorp, Kristianstad Län, Sweden - + Tommarp, Kristianstad Län, Sweden - + Rønne Bornholm, Denmark - + + Oronoko, Berrien, Michigan, USA + + + + Shemps + + + Woodland, Yolo Co., CA - + Sparks, Washoe Co., NV - + San Ramon, Conta Costa Co., CA - + + + + + + + + - + + + + - + New York Public Library Library
@@ -1351,111 +1477,221 @@ 11111
- + Invalid REPO Name Library - + Library - + Aunt Martha's Attic Library
+ 123 Main St + LittleVillage Someville ST USA + +
- + + - + + Records not imported into HEAD (header): + +GEDCOM FORM not supported Line 14: 2 FORM NOT LINEAGE-LINKED + + + + Records not imported into SUBM (Submitter): (@SUBM@) Alex Roitman,,,: + +Line ignored as not understood Line 23: 2 NOTE No address provided (note not supported) + + + + Records not imported into FAM (family) Gramps ID F0003: + +Line ignored as not understood Line 46: 2 SOUR Not really allowed here +Filename omitted Line 48: 1 OBJE + + + Hans daughter? N0000 - + Her eulogy was great! N0001 - + Inline note should get ID N0002 - - 'Smith': a very common name + + Unknown, created to replace a missing note object. + - + Keith Lloyd Smith inline N0003 - + Hans Peter Smith inline N0004 - + Hanna Smith inline N0005 - + Herman Julius Nielsen N0006 - + Evelyn Michaels N0007 - + + Records not imported into INDI (individual) Gramps ID I0016: + +Warn: ADDR overwritten Line 204: 3 ADR1 456 Main St again +ADDR element ignored '459 Main St.' Line 202: 2 ADDR 459 Main St., The Village, San Francisco, CA, USA + + + + Person Attribute Note on SSN + + + Records not imported into INDI (individual) Gramps ID I0018: + +Tag recognized but not supported Line 245: 2 TYPE first generaton + + + BIOGRAPHY Martin was listed as being a Husman, (owning a house as opposed to a farm) in the house records of Gladsax. - + A FAMC note - + Witness name: John Doe Witness comment: This is a simple test. - + Record for Edwin Michael Smith - + Witness name: No Name - + BIOGRAPHY Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November 1912 arriving in New York 27 November 1912. He was seventeen years old. On the ship passenger list his trade was listed as a Blacksmith. He came to Reno, Nevada and lived with his sister Marie for a time before settling in Sparks. He worked for Southern Pacific Railroad as a car inspector for a time, then went to work for Standard Oil Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corporal in the Medical Corp until his discharge 12 August 1919 at the Presidio in San Francisco, California. Both he and Marjorie are buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th June 1975, and she the 25th of June 1980. - + + Records not imported into FAM (family) Gramps ID F0010: + +Tag recognized but not supported Line 863: 2 _STAT + + + Records not imported into FAM (family) Gramps ID F0011: -Could not import Magnes&Anna_smiths_marr_cert.jpg Line 802: 3 OBJE -Could not import Magnes&Anna_smiths_marr_cert.jpg Line 805: 2 OBJE +Could not import Magnes&Anna_smiths_marr_cert.jpg Line 878: 3 OBJE +Could not import Magnes&Anna_smiths_marr_cert.jpg Line 881: 2 OBJE - + Records not imported into FAM (family) Gramps ID F0012: -Could not import John&Alice_smiths_marr_cert.jpg Line 829: 1 OBJE +Could not import John&Alice_smiths_marr_cert.jpg Line 905: 1 OBJE - + + Records not imported into FAM (family) Gramps ID F0008: + +Tag recognized but not supported Line 1005: 1 ADDR 123 Main st, Grantville, Virginia, USA + + + But Aunt Martha still keeps the original! - + Invalid REPO (Name instead of xref) - + Source text of Birth cert - + Invalid REPO (no name) - + The repository reference from the source is important - + + Records not imported into SOUR (source) Gramps ID S0003: + +Tag recognized but not supported Line 1045: 1 DATA +Skipped subordinate line Line 1046: 2 AGNC NYC Public Library + + + + A note on this address + + Some note on the repo + + Records not imported into REPO (repository) Gramps ID R0003: + +REFN ignored Line 1075: 3 REFN blah blah +Skipped subordinate line Line 1076: 4 TYPE who knows +Could not import Attic_photo.jpg Line 1079: 3 OBJE + + + + Records not imported into Top Level: + +Unknown tag Line 1106: 0 XXX an unknown token at level 0 + + + + Records not imported into Top Level: + +Unknown tag Line 1109: 1 @X1@ XXX and unknown token xref definition + + + + Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM. + diff --git a/gramps/gen/utils/unknown.py b/gramps/gen/utils/unknown.py index 4eb42bf1b..3d34cc832 100644 --- a/gramps/gen/utils/unknown.py +++ b/gramps/gen/utils/unknown.py @@ -29,7 +29,7 @@ Make an 'Unknown' primary object # Python modules # #------------------------------------------------------------------------- -import time +from time import strftime, localtime, time import os #------------------------------------------------------------------------- @@ -124,14 +124,14 @@ def make_unknown(class_arg, explanation, class_func, commit_func, transaction, obj2 = argv['source_class_func'](argv['source_class_arg']) obj2.set_title(_('Unknown')) obj2.add_note(explanation) - argv['source_commit_func'](obj2, transaction, time.time()) + argv['source_commit_func'](obj2, transaction, time()) retval.append(obj2) obj.set_reference_handle(obj2.handle) elif isinstance(obj, Repository): obj.set_name(_('Unknown')) obj.set_type(RepositoryType.UNKNOWN) elif isinstance(obj, Media): - obj.set_path(os.path.join(IMAGE_DIR, "image-missing.png")) + obj.set_path("image-missing.png") obj.set_mime_type('image/png') obj.set_description(_('Unknown')) elif isinstance(obj, Note): @@ -147,7 +147,7 @@ def make_unknown(class_arg, explanation, class_func, commit_func, transaction, if not hasattr(make_unknown, 'count'): make_unknown.count = 1 #primitive static variable obj.set_name(_("Unknown, was missing %(time)s (%(count)d)") % { - 'time': time.strftime('%x %X', time.localtime()), + 'time': strftime('%x %X', localtime()), 'count': make_unknown.count}) make_unknown.count += 1 else: @@ -155,7 +155,7 @@ def make_unknown(class_arg, explanation, class_func, commit_func, transaction, if hasattr(obj, 'add_note'): obj.add_note(explanation) - commit_func(obj, transaction, time.time()) + commit_func(obj, transaction, time()) retval.append(obj) return retval @@ -167,7 +167,7 @@ def create_explanation_note(dbase): """ note = Note( _('Objects referenced by this note ' 'were missing in a file imported on %s.') % - time.strftime('%x %X', time.localtime())) + strftime('%x %X', localtime())) note.set_handle(create_id()) note.set_gramps_id(dbase.find_next_note_gramps_id()) # Use defaults for privacy, format and type. diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py index d12ebaf75..2f89f116b 100644 --- a/gramps/plugins/lib/libgedcom.py +++ b/gramps/plugins/lib/libgedcom.py @@ -5974,7 +5974,7 @@ class GedcomParser(UpdateCallback): @type state: CurrentState """ # The ADDR may already have been parsed by the level above - assert state.addr.get_street() == "" + # assert state.addr.get_street() == "" if state.addr.get_street() != "": self.__add_msg(_("Warn: ADDR overwritten"), line, state) state.addr.set_street(line.data) diff --git a/gramps/plugins/test/test_imports.py b/gramps/plugins/test/test_imports.py index 93a85cbbb..65ceb4038 100644 --- a/gramps/plugins/test/test_imports.py +++ b/gramps/plugins/test/test_imports.py @@ -25,6 +25,8 @@ import unittest import os import sys import re +from time import localtime +from unittest.mock import patch #import logging from gramps.gen.merge.diff import diff_dbs, import_as_dict @@ -45,6 +47,17 @@ TEST_DIR = os.path.abspath(os.path.join(DATA_DIR, "tests")) # Local Functions # ------------------------------------------------------------------ +def mock_time(*args): + """ + Mock up a dummy to replace the varying 'time string results' + """ + return 946101600. + +def mock_localtime(*args): + """ + Mock up a dummy to replace the varying 'time string results' + """ + return localtime(946101600.) class CompleteCheck(unittest.TestCase): """The test class cases will be dynamically created at import time from @@ -174,16 +187,27 @@ def make_tst_function(tstfile, file_name): """ This is here to support the dynamic function creation. This creates the test function (a method, to be precise). """ - def tst(self): + + @patch('gramps.plugins.db.dbapi.dbapi.time') + @patch('gramps.plugins.db.bsddb.write.time') + @patch('gramps.gen.utils.unknown.localtime') + @patch('gramps.gen.utils.unknown.time') + def tst(self, mocktime, mockltime, mockwtime, mockdtime): """ This compares the import file with the expected result '.gramps' file. """ + mocktime.side_effect = mock_time + mockltime.side_effect = mock_localtime + mockwtime.side_effect = mock_time + mockdtime.side_effect = mock_time fn1 = os.path.join(TEST_DIR, tstfile) fn2 = os.path.join(TEST_DIR, (file_name + ".gramps")) fres = os.path.join(TEMP_DIR, (file_name + ".difs")) fout = os.path.join(TEMP_DIR, (file_name + ".gramps")) if "_dfs" in tstfile: config.set('preferences.default-source', True) + config.set('preferences.tag-on-import-format', "Imported") + config.set('preferences.tag-on-import', True) skp_imp_adds = False else: skp_imp_adds = True