Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #232 from prculley/csvfix

Browse Source 
9676 CSV import fails for certain types of cross references
This commit is contained in:
Sam Manzi 2016-09-14 08:59:50 +10:00 committed by GitHub
commit dd496b9acf
3 changed files with 594 additions and 591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
data/tests/imp_sample_csv.csv
View File

@ -1,123 +1,123 @@
Place,Title,Name,Type,Latitude,Longitude,Code,Enclosed_by,Date Place,Title,Name,Type,Latitude,Longitude,Code,Enclosed_by,Date,,,,,,,,,,,,,
[P0000],"Löderup, Malmöhus Län, Sweden","Löderup, Malmöhus Län, Sweden",Unknown,,,,, [P0000],"Löderup, Malmöhus Län, Sweden","Löderup, Malmöhus Län, Sweden",Unknown,,,,,,,,,,,,,,,,,,
[P0001],"Sparks, Washoe Co., NV","Sparks, Washoe Co., NV",Unknown,,,,, [P0001],"Sparks, Washoe Co., NV","Sparks, Washoe Co., NV",Unknown,,,,,,,,,,,,,,,,,,
[P0002],"San Francisco, San Francisco Co., CA","San Francisco, San Francisco Co., CA",Unknown,,,,, [P0002],"San Francisco, San Francisco Co., CA","San Francisco, San Francisco Co., CA",Unknown,,,,,,,,,,,,,,,,,,
[P0003],"Rønne, Bornholm, Denmark","Rønne, Bornholm, Denmark",Unknown,,,,, [P0003],"Rønne, Bornholm, Denmark","Rønne, Bornholm, Denmark",Unknown,,,,,,,,,,,,,,,,,,
[P0004],"Gladsax, Kristianstad Län, Sweden","Gladsax, Kristianstad Län, Sweden",Unknown,,,,, [P0004],"Gladsax, Kristianstad Län, Sweden","Gladsax, Kristianstad Län, Sweden",Unknown,,,,,,,,,,,,,,,,,,
[P0005],"Reno, Washoe Co., NV","Reno, Washoe Co., NV",Unknown,,,,, [P0005],"Reno, Washoe Co., NV","Reno, Washoe Co., NV",Unknown,,,,,,,,,,,,,,,,,,
[P0006],"Hayward, Alameda Co., CA","Hayward, Alameda Co., CA",Unknown,,,,, [P0006],"Hayward, Alameda Co., CA","Hayward, Alameda Co., CA",Unknown,,,,,,,,,,,,,,,,,,
[P0007],"Community Presbyterian Church, Danville, CA","Community Presbyterian Church, Danville, CA",Unknown,,,,, [P0007],"Community Presbyterian Church, Danville, CA","Community Presbyterian Church, Danville, CA",Unknown,,,,,,,,,,,,,,,,,,
[P0008],Sweden,Sweden,Unknown,,,,, [P0008],Sweden,Sweden,Unknown,,,,,,,,,,,,,,,,,,
[P0009],"Grostorp, Kristianstad Län, Sweden","Grostorp, Kristianstad Län, Sweden",Unknown,,,,, [P0009],"Grostorp, Kristianstad Län, Sweden","Grostorp, Kristianstad Län, Sweden",Unknown,,,,,,,,,,,,,,,,,,
[P0010],"Copenhagen, Denmark","Copenhagen, Denmark",Unknown,,,,, [P0010],"Copenhagen, Denmark","Copenhagen, Denmark",Unknown,,,,,,,,,,,,,,,,,,
[P0011],"Hoya/Jona/Hoia, Sweden","Hoya/Jona/Hoia, Sweden",Unknown,,,,, [P0011],"Hoya/Jona/Hoia, Sweden","Hoya/Jona/Hoia, Sweden",Unknown,,,,,,,,,,,,,,,,,,
[P0012],"Simrishamn, Kristianstad Län, Sweden","Simrishamn, Kristianstad Län, Sweden",Unknown,,,,, [P0012],"Simrishamn, Kristianstad Län, Sweden","Simrishamn, Kristianstad Län, Sweden",Unknown,,,,,,,,,,,,,,,,,,
[P0013],"Fremont, Alameda Co., CA","Fremont, Alameda Co., CA",Unknown,,,,, [P0013],"Fremont, Alameda Co., CA","Fremont, Alameda Co., CA",Unknown,,,,,,,,,,,,,,,,,,
[P0016],"Santa Rosa, Sonoma Co., CA","Santa Rosa, Sonoma Co., CA",Unknown,,,,, [P0016],"Santa Rosa, Sonoma Co., CA","Santa Rosa, Sonoma Co., CA",Unknown,,,,,,,,,,,,,,,,,,
[P0017],"San Jose, Santa Clara Co., CA","San Jose, Santa Clara Co., CA",Unknown,,,,, [P0017],"San Jose, Santa Clara Co., CA","San Jose, Santa Clara Co., CA",Unknown,,,,,,,,,,,,,,,,,,
[P0018],UC Berkeley,UC Berkeley,Unknown,,,,, [P0019],"Smestorp, Kristianstad Län, Sweden","Smestorp, Kristianstad Län, Sweden",Unknown,,,,,,,,,,,,,,,,,,
[P0019],"Smestorp, Kristianstad Län, Sweden","Smestorp, Kristianstad Län, Sweden",Unknown,,,,, [P0020],"Tommarp, Kristianstad Län, Sweden","Tommarp, Kristianstad Län, Sweden",Unknown,,,,,,,,,,,,,,,,,,
[P0020],"Tommarp, Kristianstad Län, Sweden","Tommarp, Kristianstad Län, Sweden",Unknown,,,,, [P0021],"Rønne Bornholm, Denmark","Rønne Bornholm, Denmark",Unknown,,,,,,,,,,,,,,,,,,
[P0021],"Rønne Bornholm, Denmark","Rønne Bornholm, Denmark",Unknown,,,,, [P0022],"Woodland, Yolo Co., CA","Woodland, Yolo Co., CA",Unknown,,,,,,,,,,,,,,,,,,
[P0022],"Woodland, Yolo Co., CA","Woodland, Yolo Co., CA",Unknown,,,,, [P0023],"San Ramon, Conta Costa Co., CA","San Ramon, Conta Costa Co., CA",Unknown,,,,,,,,,,,,,,,,,,
[P0023],"San Ramon, Conta Costa Co., CA","San Ramon, Conta Costa Co., CA",Unknown,,,,, [P0026],United States of America,USA,Country,,,,,,,,,,,,,,,,,,
[P0026],United States of America,USA,Country,,,,, [P0028],"California, USA",California,State,,,,[P0026],2016-06-04,,,,,,,,,,,,,
[P0028],"California, USA",California,State,,,,[P0026],2016-06-04 [P0025],"Colorado, USA",Colorado,State,,,,[P0026],,,,,,,,,,,,,,
[P0025],"Colorado, USA",Colorado,State,,,,[P0026], [P0027],"Sacramento Co., California, USA",Sacramento Co.,County,,,,[P0028],2016-06-01,,,,,,,,,,,,,
[P0027],"Sacramento Co., California, USA",Sacramento Co.,County,,,,[P0028],2016-06-01 [P0015],"Sacramento, Sacramento Co., CA","Sacramento, Sacramento Co., CA",City,,,,[P0027],2016-06-04,,,,,,,,,,,,,
[P0015],"Sacramento, Sacramento Co., CA","Sacramento, Sacramento Co., CA",City,,,,[P0027],2016-06-04 [P0024],"Denver Co., Colorado, USA",Denver Co.,County,,,,[P0025],,,,,,,,,,,,,,
[P0024],"Denver Co., Colorado, USA",Denver Co.,County,,,,[P0025], [P0014],"Denver, Denver Co., CO","Denver, Denver Co., CO",City,39.7392,104.9903 W,,[P0024],,,,,,,,,,,,,,
[P0014],"Denver, Denver Co., CO","Denver, Denver Co., CO",City,39.7392,104.9903 W,,[P0024], L18,UC Berkeley,UC Berkeley,Unknown,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,
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 Person,Surname,Given,Call,Suffix,Prefix,Title,Gender,Birth date,Birth place,birthplaceid,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",,,,,,,,,,, [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",,,,, [I0016],Anderson,Jennifer,,,,,female,5 Nov 1907,"Rønne, Bornholm, Denmark",,,,,,29-May-85,"San Francisco, San Francisco Co., CA",,,,,
[I0025],Ericsdotter,Marta,,,,,female,about 1775,Sweden,,,,,,,,,,, [I0025],Ericsdotter,Marta,,,,,female,about 1775,Sweden,,,,,,,,,,,,
[I0041],Green,Janis Elaine,,,,,female,2 Dec 1935,,,,,,,,,,,, [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",,,,, [I0000],Hansdotter,Anna,,,,,female,2 Oct 1864,"Löderup, Malmöhus Län, Sweden",,,,,,29-Sep-45,"Sparks, Washoe Co., NV",,,,,
[I0038],Hansdotter,Kerstina,,,,,female,29 Nov 1832,"Smestorp, Kristianstad Län, Sweden",,,,,before 1908,Sweden,,,,, [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",,,,,,,,,,, [I0032],Horne,Darcy,,,,,female,2 Jul 1966,"Sacramento, Sacramento Co., CA",,,,,,,,,,,,
[I0036],Jefferson,Elna,,,,,female,14 Sep 1800,"Gladsax, Kristianstad Län, Sweden",,,,,,Sweden,,,,, [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,,,,,, [I0017],Jones,Lillie Harriet,,,,,female,2 May 1910,"Rønne, Bornholm, Denmark",,,,,,26-Jun-90,,,,,,
[I0042],Ke 柯,雪,,,,,male,,,,,,,,,,,,, [I0013],Michaels,Evelyn,,,,,female,about 1897,,,,,,,,,,,,,
[I0013],Michaels,Evelyn,,,,,female,about 1897,,,,,,,,,,,, [I0012],Nielsen,Herman Julius,,,,,male,31 Aug 1889,"Rønne, Bornholm, Denmark",,,,,,1945,,,,,,
[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-80,"Reno, Washoe Co., NV",,,,,
[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",,,,,,,,,,,,
[I0034],Perkins,Alice Paula,,,,,female,22 Nov 1933,"Sparks, Washoe Co., NV",,,,,,,,,,, [I0002],Smith,Amber Marie,,,,,female,12 Apr 1998,"Hayward, Alameda Co., CA",,,,,,,,,,,,
[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-63,"San Francisco, San Francisco 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-59,"Reno, Washoe Co., NV",,,,,
[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",,,,,,,,,,,,
[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",,,,,,,,,,
[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",,,,,,,,,,,,
[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",,,,,,,,,,,,
[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-63,"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",,,,,
[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",,,,,,,,,,,,
[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-77,"San Francisco, San Francisco Co., CA",,5-Feb-77,"San Francisco, San Francisco Co., CA",findagrave.com,
[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",,,,,
[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-75,"Reno, Washoe Co., NV",,,,,
[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",,,,,,,,,,,,
[I0007],Smith,Ingar,,,,,female,after 1823,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,, [I0027],Smith,Ingeman,,,,,male,about 1770,Sweden,,,,,,,,,,,,
[I0027],Smith,Ingeman,,,,,male,about 1770,Sweden,,,,,,,,,,, [I0004],Smith,Ingeman,,,,,male,29 Jan 1826,"Gladsax, Kristianstad Län, 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",,,,,,,,,,,,
[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",,,,,,,,,,,,
[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-66,"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",,,,,,,,,,,,
[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",,,,,,,,,,,,
[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-10,"Rønne, Bornholm, Denmark",,,,,
[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",,,,,,,,,,,,
[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",,,,,,,,,,,,
[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,,,,,
[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,,,,,
[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",,,,,,,,,,,,
[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-27,"Rønne, Bornholm, Denmark",,,,,
[I0028],Streiffert,Anna,,,,,female,23 Sep 1860,"Hoya/Jona/Hoia, Sweden",,,,,2 Feb 1927,"Rønne, Bornholm, Denmark",,,,, [I0006],Willard,Edwin,,,,,male,about 1886,,,,,,,,,,,,,
[I0006],Willard,Edwin,,,,,male,about 1886,,,,,,,,,,,, X42,Ke 柯,雪,,,,,male,1-Jan-70,,L18,,,,,,,,,,,
[I0043],リチミシキスイミ,ピーター,,,,,male,,,,,,,,,,,,, X43,リチミシキスイミ,ピーター,,,,,male,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,
Marriage,Husband,Wife,Date,Place,Source,Note Marriage,Husband,Wife,Date,Place,Source,Note,,,,,,,,,,,,,,,
[F0000],[I0039],[I0036],about 1816,"Gladsax, Kristianstad Län, Sweden",, [F0000],[I0039],[I0036],about 1816,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,,,,,,,
[F0001],[I0027],[I0025],about 1790,Sweden,, [F0001],[I0027],[I0025],about 1790,Sweden,,,,,,,,,,,,,,,,,
[F0002],[I0022],[I0038],about 1856,,, [F0002],[I0022],[I0038],about 1856,,,,,,,,,,,,,,,,,,
[F0003],[I0024],[I0000],27 Nov 1885,"Rønne, Bornholm, Denmark",, [F0003],[I0024],[I0000],27 Nov 1885,"Rønne, Bornholm, Denmark",,,,,,,,,,,,,,,,,
[F0004],[I0006],[I0026],about 1910,,, [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",,,,,,,,,,,,,,,,,
[F0006],[I0008],[I0031],31 Oct 1927,"Reno, Washoe Co., NV",, [F0007],[I0015],[I0013],about 1920,,,,,,,,,,,,,,,,,,
[F0007],[I0015],[I0013],about 1920,,, [F0008],[I0033],[I0041],10 Aug 1958,"San Francisco, San Francisco Co., CA",,,,,,,,,,,,,,,,,
[F0008],[I0033],[I0041],10 Aug 1958,"San Francisco, San Francisco Co., CA",, [F0009],[I0010],[I0017],,,,,,,,,,,,,,,,,,,
[F0009],[I0010],[I0017],,,, [F0010],[I0019],[I0032],12 Jul 1986,"Woodland, Yolo Co., CA",,,,,,,,,,,,,,,,,
[F0010],[I0019],[I0032],12 Jul 1986,"Woodland, Yolo Co., CA",, [F0011],[I0003],[I0028],24 Aug 1884,"Rønne, Bornholm, Denmark",,,,,,,,,,,,,,,,,
[F0011],[I0003],[I0028],24 Aug 1884,"Rønne, Bornholm, Denmark",, [F0012],[I0018],[I0034],4 Jun 1954,"Sparks, Washoe Co., NV",Marriage Certificae,,,,,,,,,,,,,,,,
[F0012],[I0018],[I0034],4 Jun 1954,"Sparks, Washoe Co., NV",Marriage Certificae, [F0013],[I0037],[I0030],27 May 1995,"San Ramon, Conta Costa Co., CA",,,,,,,,,,,,,,,,,
[F0013],[I0037],[I0030],27 May 1995,"San Ramon, Conta Costa Co., CA",, [F0014],[I0010],[I0016],,,,,,,,,,,,,,,,,,,
[F0014],[I0010],[I0016],,,, Z5,[I0012],[I0023],30 Nov 1912,"Rønne, Bornholm, Denmark",,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,
Family,Child Family,Child,,,,,,,,,,,,,,,,,,,,
[F0000],[I0011] [F0000],[I0011],,,,,,,,,,,,,,,,,,,,
[F0000],[I0007] [F0000],[I0007],,,,,,,,,,,,,,,,,,,,
[F0000],[I0004] [F0000],[I0004],,,,,,,,,,,,,,,,,,,,
[F0000],[I0022] [F0000],[I0022],,,,,,,,,,,,,,,,,,,,
[F0001],[I0039] [F0001],[I0039],,,,,,,,,,,,,,,,,,,,
[F0002],[I0003] [F0002],[I0003],,,,,,,,,,,,,,,,,,,,
[F0002],[I0009] [F0002],[I0009],,,,,,,,,,,,,,,,,,,,
[F0002],[I0024] [F0002],[I0024],,,,,,,,,,,,,,,,,,,,
[F0003],[I0026] [F0003],[I0026],,,,,,,,,,,,,,,,,,,,
[F0003],[I0023] [F0003],[I0023],,,,,,,,,,,,,,,,,,,,
[F0003],[I0021] [F0003],[I0021],,,,,,,,,,,,,,,,,,,,
[F0003],[I0008] [F0003],[I0008],,,,,,,,,,,,,,,,,,,,
[F0003],[I0015] [F0003],[I0015],,,,,,,,,,,,,,,,,,,,
[F0003],[I0020] [F0003],[I0020],,,,,,,,,,,,,,,,,,,,
[F0003],[I0010] [F0003],[I0010],,,,,,,,,,,,,,,,,,,,
[F0005],[I0042] Z5,X42,,,,,,,,,,,,,,,,,,,,
[F0006],[I0018] [F0006],[I0018],,,,,,,,,,,,,,,,,,,,
[F0006],[I0014] [F0006],[I0014],,,,,,,,,,,,,,,,,,,,
[F0008],[I0019] [F0008],[I0019],,,,,,,,,,,,,,,,,,,,
[F0008],[I0001] [F0008],[I0001],,,,,,,,,,,,,,,,,,,,
[F0008],[I0029] [F0008],[I0029],,,,,,,,,,,,,,,,,,,,
[F0009],[I0033] [F0009],[I0033],,,,,,,,,,,,,,,,,,,,
[F0010],[I0035] [F0010],[I0035],,,,,,,,,,,,,,,,,,,,
[F0012],[I0040] [F0012],[I0040],,,,,,,,,,,,,,,,,,,,
[F0012],[I0037] [F0012],[I0037],,,,,,,,,,,,,,,,,,,,
[F0013],[I0005] [F0013],[I0005],,,,,,,,,,,,,,,,,,,,
[F0013],[I0002] [F0013],[I0002],,,,,,,,,,,,,,,,,,,,
Z5,X43,,,,,,,,,,,,,,,,,,,,

Can't render this file because it has a wrong number of fields in line 32.

758
data/tests/imp_sample_csv.gramps
View File

File diff suppressed because it is too large Load Diff

181
gramps/plugins/importer/importcsv.py
View File

@ -154,94 +154,83 @@ class CSVParser:
self.place_types[custom_type] = 0 self.place_types[custom_type] = 0
self.place_types[custom_type.lower()] = 0 self.place_types[custom_type.lower()] = 0
column2label = { column2label = {
"surname": ("Lastname", "Surname", _("Surname"), "lastname", "surname": ("lastname", "last_name", "surname", _("surname"),
"last_name", "surname", _("surname")), _("Surname")),
"firstname": ("Firstname", "Given name", _("Given name"), "Given", "firstname": ("firstname", "first_name", "given_name", "given",
_("Given"), "firstname", "first_name", "given_name", "given name", _("given name"), _("given"),
"given name", _("given name"), "given", _("given")), _("Given"), _("Given name")),
"callname": ("Callname", "Call name", _("Call name"), "Call", "callname": ("call name", _("Call name"), "callname", "call_name",
_("Call"), "callname", "call_name", "call name", "call", "call", _("Call"), _("call")),
_("call")), "title": ("title", _("title"), _("Person or Place|title")),
"title": ("Title", _("Person or Place|Title"), "title", _("Person or Place|title")), "prefix": ("prefix", _("prefix"), _("Prefix")),
"prefix": ("Prefix", _("Prefix"), "prefix", _("prefix")), "suffix": ("suffix", _("suffix"), _("Suffix")),
"suffix": ("Suffix", _("Suffix"), "suffix", _("suffix")), "gender": ("gender", _("gender"), _("Gender")),
"gender": ("Gender", _("Gender"), "gender", _("gender")), "source": ("source", _("source"), _("Source")),
"source": ("Source", _("Source"), "source", _("source")), "note": ("note", _("note"), _("Note")),
"note": ("Note", _("Note"), "note", _("note")), "birthplace": ("birthplace", "birth_place", "birth place",
"birthplace": ("Birthplace", "Birth place", _("Birth place"), _("birth place"), _("Birth place")),
"birthplace", "birth_place", "birth place", _("birth place")), "birthplace_id": ("birthplaceid", "birth_place_id",
"birthplace_id": ("Birthplaceid", "Birth place id", _("Birth place id"), "birth place id", _("birth place id"),
"birthplaceid", "birth_place_id", "birth place id", _("birth place id"),
"birthplace_id"), "birthplace_id"),
"birthdate": ("Birthdate", "Birth date", _("Birth date"), "birthdate": ("birthdate", "birth_date", "birth date",
"birthdate", "birth_date", "birth date", _("birth date")), _("birth date")),
"birthsource": ("Birthsource", "Birth source", _("Birth source"), "birthsource": ("birthsource", "birth_source", "birth source",
"birthsource", "birth_source", "birth source", _("birth source")),
_("birth source")), "baptismplace": ("baptismplace", "baptism place",
"baptismplace": ("Baptismplace", "Baptism place", _("baptism place")),
_("Baptism place"), "baptismplace", "baptism place", "baptismplace_id": ("baptismplaceid", "baptism place id",
_("baptism place")),
"baptismplace_id": ("Baptismplaceid", "Baptism place id",
_("Baptism place id"), "baptismplaceid", "baptism place id",
_("baptism place id"), "baptism_place_id", _("baptism place id"), "baptism_place_id",
"baptismplace_id"), "baptismplace_id"),
"baptismdate": ("Baptismdate", "Baptism date", _("Baptism date"), "baptismdate": ("baptismdate", "baptism date", _("baptism date")),
"baptismdate", "baptism date", _("baptism date")), "baptismsource": ("baptismsource", "baptism source",
"baptismsource": ("Baptismsource", "Baptism source", _("baptism source")),
_("Baptism source"), "baptismsource", "baptism source", "burialplace": ("burialplace", "burial place", _("burial place")),
_("baptism source")), "burialplace_id": ("burialplaceid", "burial place id",
"burialplace": ("Burialplace", "Burial place", _("Burial place"), _("burial place id"), "burial_place_id",
"burialplace", "burial place", _("burial place")), "burialplace_id"),
"burialplace_id": ("Burialplaceid", "Burial place id", _("Burial place id"), "burialdate": ("burialdate", "burial date", _("burial date")),
"burialplaceid", "burial place id", _("burial place id"), "burialsource": ("burialsource", "burial source",
"burial_place_id", "burialplace_id"), _("burial source")),
"burialdate": ("Burialdate", "Burial date", _("Burial date"), "deathplace": ("deathplace", "death_place", "death place",
"burialdate", "burial date", _("burial date")), _("death place")),
"burialsource": ("Burialsource", "Burial source", "deathplace_id": ("deathplaceid", "death place id",
_("Burial source"), "burialsource", "burial source", _("death place id"), "death_place_id",
_("burial source")), "deathplace_id"),
"deathplace": ("Deathplace", "Death place", _("Death place"), "deathdate": ("deathdate", "death_date", "death date",
"deathplace", "death_place", "death place", _("death place")), _("death date")),
"deathplace_id": ("Deathplaceid", "Death place id", _("Death place id"), "deathsource": ("deathsource", "death_source", "death source",
"deathplaceid", "death_place_id", "death place id", _("death place id"), _("death source")),
"death_place_id", "deathplace_id"), "deathcause": ("deathcause", "death_cause", "death cause",
"deathdate": ("Deathdate", "Death date", _("Death date"), _("death cause")),
"deathdate", "death_date", "death date", _("death date")), "grampsid": (_("Gramps ID"), "grampsid", "id", "gramps_id",
"deathsource": ("Deathsource", "Death source", _("Death source"), "gramps id"),
"deathsource", "death_source", "death source", "person": ("person", _("person"), _("Person")),
_("death source")),
"deathcause": ("Deathcause", "Death cause", _("Death cause"),
"deathcause", "death_cause", "death cause", _("death cause")),
"grampsid": ("Grampsid", "ID", "Gramps id", _("Gramps ID"),
"grampsid", "id", "gramps_id", "gramps id", _("Gramps id")),
"person": ("Person", _("Person"), "person", _("person")),
# ---------------------------------- # ----------------------------------
"child": ("Child", _("Child"), "child", _("child")), "child": ("child", _("child"), _("Child")),
"family": ("Family", _("Family"), "family", _("family")), "family": ("family", _("family"), _("Family")),
# ---------------------------------- # ----------------------------------
"wife": ("Mother", _("Mother"), "Wife", _("Wife"), "Parent2", "wife": ("mother", _("mother"), _("Mother"),
_("Parent2"), "mother", _("mother"), "wife", _("wife"), "wife", _("wife"), _("Wife"),
"parent2", _("parent2")), "parent2", _("parent2")),
"husband": ("Father", _("Father"), "Husband", _("Husband"), "husband": ("father", _("father"), _("Father"),
"Parent1", _("Parent1"), "father", _("father"), "husband", "husband", _("husband"), _("Husband"),
_("husband"), "parent1", _("parent1")), "parent1", _("parent1")),
"marriage": ("Marriage", _("Marriage"), "marriage", _("marriage")), "marriage": ("marriage", _("marriage"), _("Marriage")),
"date": ("Date", _("Date"), "date", _("date")), "date": ("date", _("date"), _("Date")),
"place": ("Place", _("Place"), "place", _("place")), "place": ("place", _("place"), _("Place")),
"place_id": ("Placeid", "place id", "Place id", "place_id", "placeid"), "place_id": ("place id", "place_id", "placeid", _("place id")),
"name": ("Name", _("Name"), "name", _("name")), "name": ("name", _("name"), _("Name")),
"type": ("Type", _("Type"), "type", _("type")), "type": ("type", _("type"), _("Type")),
"latitude": ("Latitude", _("latitude"), "latitude", _("latitude")), "latitude": ("latitude", _("latitude")),
"longitude": ("Longitude", _("Longitude"), "longitude", _("longitude")), "longitude": ("longitude", _("longitude")),
"code": ("Code", _("Code"), "code", _("code")), "code": ("code", _("code"), _("Code")),
"enclosed_by": ("Enclosed by", _("Enclosed by"), "enclosed by", _("enclosed by"), "enclosed_by": ("enclosed by", _("enclosed by"),
"enclosed_by", _("enclosed_by"), "Enclosed_by", _("Enclosed_by"), "enclosed_by", _("enclosed_by"), "enclosedby")
"enclosedby")
} }
lab2col_dict = [] lab2col_dict = []
for key in list(column2label.keys()): for key in list(column2label.keys()):
for val in column2label[key]: for val in column2label[key]:
lab2col_dict.append((val, key)) lab2col_dict.append((val.lower(), key))
self.label2column = dict(lab2col_dict) self.label2column = dict(lab2col_dict)
if default_tag_format: if default_tag_format:
name = time.strftime(default_tag_format) name = time.strftime(default_tag_format)
@ -283,10 +272,12 @@ class CSVParser:
return self.lookup(type_, id_) return self.lookup(type_, id_)
else: else:
return db_lookup return db_lookup
elif id_.lower() in self.fref:
return self.fref[id_.lower()]
else: else:
return None id_ = self.db.fid2user_format(id_)
if id_.lower() in self.fref:
return self.fref[id_.lower()]
else:
return None
elif type_ == "person": elif type_ == "person":
if id_.startswith("[") and id_.endswith("]"): if id_.startswith("[") and id_.endswith("]"):
id_ = self.db.id2user_format(id_[1:-1]) id_ = self.db.id2user_format(id_[1:-1])
@ -295,22 +286,26 @@ class CSVParser:
return self.lookup(type_, id_) return self.lookup(type_, id_)
else: else:
return db_lookup return db_lookup
elif id_.lower() in self.pref:
return self.pref[id_.lower()]
else: else:
return None id_ = self.db.id2user_format(id_)
if id_.lower() in self.pref:
return self.pref[id_.lower()]
else:
return None
elif type_ == "place": elif type_ == "place":
if id_.startswith("[") and id_.endswith("]"): if id_.startswith("[") and id_.endswith("]"):
id_ = self.db.id2user_format(id_[1:-1]) id_ = self.db.pid2user_format(id_[1:-1])
db_lookup = self.db.get_place_from_gramps_id(id_) db_lookup = self.db.get_place_from_gramps_id(id_)
if db_lookup is None: if db_lookup is None:
return self.lookup(type_, id_) return self.lookup(type_, id_)
else: else:
return db_lookup return db_lookup
elif id_.lower() in self.placeref:
return self.placeref[id_.lower()]
else: else:
return None id_ = self.db.pid2user_format(id_)
if id_.lower() in self.placeref:
return self.placeref[id_.lower()]
else:
return None
else: else:
LOG.warning("invalid lookup type in CSV import: '%s'" % type_) LOG.warning("invalid lookup type in CSV import: '%s'" % type_)
return None return None
@ -382,7 +377,7 @@ class CSVParser:
continue continue
###################################### ######################################
if header is None: if header is None:
header = [self.cleanup_column_name(r) for r in row] header = [self.cleanup_column_name(r.lower()) for r in row]
col = {} col = {}
count = 0 count = 0
for key in header: for key in header:
@ -433,7 +428,7 @@ class CSVParser:
wife.set_gender(Person.FEMALE) wife.set_gender(Person.FEMALE)
self.db.commit_person(wife, self.trans) self.db.commit_person(wife, self.trans)
if marriage_ref: if marriage_ref:
self.storeup("family", marriage_ref.lower(), family) self.storeup("family", marriage_ref, family)
if marriagesource: if marriagesource:
# add, if new # add, if new
new, marriagesource = self.get_or_create_source(marriagesource) new, marriagesource = self.get_or_create_source(marriagesource)
@ -786,8 +781,8 @@ class CSVParser:
place = self.create_place() place = self.create_place()
if place_id is not None: if place_id is not None:
if place_id.startswith("[") and place_id.endswith("]"): if place_id.startswith("[") and place_id.endswith("]"):
place.gramps_id = self.db.id2user_format(place_id[1:-1]) place.gramps_id = self.db.pid2user_format(place_id[1:-1])
self.storeup("place", place_id.lower(), place) self.storeup("place", place_id, place)
if place_title is not None: if place_title is not None:
place.title = place_title place.title = place_title
if place_name is not None: if place_name is not None: