From dc2afe8f55c64d61adc11d0867e85abfebb3490a Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 21 Apr 2007 04:54:28 +0000 Subject: [PATCH] 2007-04-20 Don Allingham * src/DisplayModels/_BaseModel.py (BaseModel.add_row_by_handle): if search not defined, do an insert * src/GrampsDb/_ReadGedcom.py: fix calendar parsing * src/GrampsDb/_WriteGedcom.py: fix calendar generation svn: r8413 --- ChangeLog | 6 + example/gedcom/sample.ged | 750 +++++++++++++++++++----------- src/DbManager.py | 2 +- src/DisplayModels/_BaseModel.py | 2 +- src/GrampsDbUtils/_GedcomLex.py | 11 +- src/GrampsDbUtils/_WriteGedcom.py | 6 +- 6 files changed, 493 insertions(+), 284 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9feb01751..421ec7da7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-20 Don Allingham + * src/DisplayModels/_BaseModel.py (BaseModel.add_row_by_handle): + if search not defined, do an insert + * src/GrampsDb/_ReadGedcom.py: fix calendar parsing + * src/GrampsDb/_WriteGedcom.py: fix calendar generation + 2007-04-19 Brian Matherly * src/docgen/ODFDoc.py: PROPERLY escape ampersands diff --git a/example/gedcom/sample.ged b/example/gedcom/sample.ged index 171eb6061..8e9c05480 100755 --- a/example/gedcom/sample.ged +++ b/example/gedcom/sample.ged @@ -1,130 +1,44 @@ 0 HEAD -1 SOUR FTW -2 VERS 8.0 -2 NAME Family Tree Maker for Windows -2 CORP Genealogy.com -3 ADDR 39500 Stevenson Pl. #204 -4 CONT Fremont, CA 95439 -3 PHON (510) 794-6850 -1 DEST FTW -1 DATE 3 JUN 2001 -1 CHAR ANSEL -1 FILE C:\My Documents\Family Tree\Sample.GED +1 SOUR GRAMPS +2 VERS 2.2.7-0.SVN8265M +2 NAME GRAMPS +1 DEST GEDCOM 5.5 +1 DATE 17 APR 2007 +1 CHAR UTF-8 +1 SUBM @SUBM@ +1 FILE /home/dona/branches/gramps23/example/gedcom/sample.ged +1 COPR Copyright (c) 2007 Don Allingham. 1 GEDC 2 VERS 5.5 2 FORM LINEAGE-LINKED -1 PLAC -2 FORM city, state -1 _SCHEMA -2 INDI -3 _FA1 -4 LABL Marriage fact -3 _FA2 -4 LABL Fact 2 -3 _FA3 -4 LABL Fact 3 -3 _FA4 -4 LABL Fact 4 -3 _FA5 -4 LABL Fact 5 -3 _FA6 -4 LABL Fact 6 -3 _FA7 -4 LABL Fact 7 -3 _FA8 -4 LABL Fact 8 -3 _FA9 -4 LABL Fact 9 -3 _FA10 -4 LABL Fact 10 -3 _FA11 -4 LABL Fact 11 -3 _FA12 -4 LABL Fact 12 -3 _FA13 -4 LABL Fact 13 -3 _MREL -4 LABL Relationship to Mother -3 _FREL -4 LABL Relationship to Father -2 FAM -3 _FA1 -4 LABL Marriage fact -3 _FA2 -4 LABL Fact 2 -3 _MSTAT -4 LABL Marriage Beginning Status -3 _MEND -4 LABL Marriage Ending Status -0 @IC3a2b1@ INDI -1 NAME Edwin Michael /Smith/ -2 NOTE This is a note attached to a name -2 SOUR @S1600@ -1 _UID THIS_IS_A_UID -1 AFN GXXX-XX -1 RFN MY-RFN -1 ASSO @I07@ -2 RELA SomeRelationship -2 NOTE This is a note for the ASSOC import -2 SOUR @S1600@ -1 SEX M -1 TITL Grand Poobah -1 OBJE -2 FORM jpeg -2 FILE O0.jpg -1 BIRT Edwin Michael Smith's Birth event -2 DATE EST 24 MAY 1961 -2 PLAC San Jose, Santa Clara Co., CA -3 FORM city, county, state -2 FAMC @F02@ -1 OCCU -2 PLAC Software Engineer -1 EDUC -2 DATE BET. 1979 - 1984 -2 PLAC UC Berkeley -1 RESI -2 DATE CAL 1 JAN 1985 -2 ADDR Address Line 0 -3 ADR1 Adr1 line -3 ADR2 Adr2 line -3 CITY City line -3 STAE State line -3 POST Post line -2 NOTE This is the residence note -2 PHON (123) 456-7890 -1 SSN 123-456-7890 -1 CAST cast keyword -1 DSCR dscr keyword -1 IDNO idno keyword -1 NATI nati keyword -1 NCHI nchi keyword -1 _DEG -2 DATE 1984 -2 PLAC B.S.E.E. -1 OBJE -2 FORM jpg -2 FILE C:\Images\MyImages\test.jpg -2 TITL Random title -1 FAMS @F01@ -1 FAMC @F02@ +0 @SUBM@ SUBM +1 NAME Don Allingham +1 ADDR Not Provided +2 CONT Not Provided 0 @I02@ INDI +1 REFN 2 1 NAME Alice Paula /Perkins/ +2 GIVN Alice Paula +2 SURN Perkins 2 SOUR @S1600@ 3 PAGE 1933 BIRTH: NV, Washoe Co., Sparks, Birth Certificate, Nevada State Department of Health, Vital Records, Sparks, NV, certificate #599632 3 DATA -4 TEXT Alice Paula Perkins born 22 Nov 1933, Sparks, Washoe Co, Nevada daughter of Paul Perkins and Stella Mason. +4 TEXT Alice Paula Perkins born 22 Nov 1933, Sparks, Washoe Co, Nevada daughte +5 CONC r of Paul Perkins and Stella Mason. 2 SOUR @S1601@ 1 SEX F -1 OBJE -2 FORM jpeg -2 FILE foo/O0.jpg 1 BIRT 2 DATE 22 NOV 1933 2 PLAC Sparks, Washoe Co., NV -1 REFN 3 -1 FAMS @F02@ +1 FAMS @F0000@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I03@ INDI +1 REFN 3 1 NAME Martin /Smith/ +2 GIVN Martin +2 SURN Smith 1 SEX M 1 BIRT 2 DATE BET. 1794 - 1796 @@ -133,16 +47,19 @@ 2 DATE deceased 2 PLAC Sweden 2 AGNC Some type of agency -2 AGE 94y 2 CAUS Killer tomatoes -1 ADOP -2 FAMC @F04@ -3 ADOP @I38@ -1 REFN 366 +2 AGE 94y +1 ADOP Y +1 FAMC @F0001@ 1 FAMS @F03@ -1 FAMC @F04@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I04@ INDI +1 REFN 4 1 NAME Elna /Jefferson/ +2 GIVN Elna +2 SURN Jefferson 1 SEX F 1 BIRT 2 DATE 14 SEP 1800 @@ -152,10 +69,15 @@ 1 CHR 2 DATE 16 SEP 1800 2 PLAC Gladsax, Kristianstad Lan, Sweden -1 REFN 367 1 FAMS @F03@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I05@ INDI +1 REFN 5 1 NAME Martin /Smith/ +2 GIVN Martin +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 19 NOV 1830 @@ -166,34 +88,43 @@ 1 BAPM 2 DATE 23 NOV 1830 2 PLAC Gladsax, Kristianstad Lan, Sweden -1 REFN 371 -1 FAMS @F05@ 1 FAMC @F03@ -1 NOTE @NI05@ -0 @NI05@ NOTE -1 CONC -1 CONT BIOGRAPHY -1 CONT Martin was listed as being a Husman, (owning a house as opposed to a -1 CONT farm) in the house records of Gladsax. +1 FAMS @F05@ +1 NOTE +2 CONT BIOGRAPHY +2 CONT Martin was listed as being a Husman, (owning a house as opposed to a +2 CONT farm) in the house records of Gladsax. +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I06@ INDI +1 REFN 6 1 NAME Kerstina /Hansdotter/ +2 GIVN Kerstina +2 SURN Hansdotter 1 SEX F 1 BIRT 2 DATE 29 NOV 1832 2 PLAC Smestorp, Kristianstad Lan, Sweden 1 DEAT -2 DATE BEF. 1908 +2 DATE BEF 1908 2 PLAC Sweden -1 REFN 374 1 FAMS @F05@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I07@ INDI -1 NAME Gustaf /Smith/, Sr. +1 REFN 7 +1 NAME Gustaf /Smith/ , Sr. +2 GIVN Gustaf +2 SURN Smith +2 NSFX , Sr. 1 SEX M 1 BIRT 2 DATE 28 NOV 1862 2 PLAC Grostorp, Kristianstad Lan, Sweden 1 DEAT -2 DATE BEF. 23 JUL 1930 +2 DATE BEF 23 JUL 1930 2 PLAC Sparks, Washoe Co., NV 1 IMMI 2 DATE 21 MAY 1908 @@ -201,11 +132,16 @@ 1 CHR 2 DATE 7 DEC 1862 2 PLAC Gladsax, Kristianstad Lan, Sweden -1 REFN 377 -1 FAMS @F06@ 1 FAMC @F05@ +1 FAMS @F06@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I08@ INDI +1 REFN 8 1 NAME Anna /Hansdotter/ +2 GIVN Anna +2 SURN Hansdotter 1 SEX F 1 BIRT 2 DATE 2 OCT 1864 @@ -214,8 +150,14 @@ 2 DATE 29 SEP 1945 2 PLAC Sparks, Washoe Co., NV 1 FAMS @F06@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I09@ INDI +1 REFN 9 1 NAME Kirsti Marie /Smith/ +2 GIVN Kirsti Marie +2 SURN Smith 1 SEX F 1 BIRT 2 DATE 15 DEC 1886 @@ -223,10 +165,16 @@ 1 DEAT 2 DATE 18 JUL 1966 2 PLAC San Francisco, San Francisco Co., CA -1 FAMS @F07@ 1 FAMC @F06@ +1 FAMS @F07@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I10@ INDI +1 REFN 10 1 NAME Astrid Shermanna Augusta /Smith/ +2 GIVN Astrid Shermanna Augusta +2 SURN Smith 1 SEX F 1 BIRT 2 DATE 31 JAN 1889 @@ -234,10 +182,16 @@ 1 DEAT 2 DATE 21 DEC 1963 2 PLAC San Francisco, San Francisco Co., CA -1 FAMS @F08@ 1 FAMC @F06@ +1 FAMS @F08@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I11@ INDI +1 REFN 11 1 NAME Hjalmar /Smith/ +2 GIVN Hjalmar +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 31 JAN 1893 @@ -246,8 +200,14 @@ 2 DATE 25 SEP 1894 2 PLAC Ronne, Bornholm, Denmark 1 FAMC @F06@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I12@ INDI +1 REFN 12 1 NAME Hjalmar /Smith/ +2 GIVN Hjalmar +2 SURN Smith 2 SOUR @S1600@ 1 SEX M 1 BIRT @@ -262,26 +222,29 @@ 1 IMMI 2 DATE 14 NOV 1912 2 PLAC Copenhagen, Denmark -1 REFN 364 -1 FAMS @F09@ 1 FAMC @F06@ -1 NOTE @NI12@ -0 @NI12@ NOTE -1 CONC -1 CONT BIOGRAPHY -1 CONT Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November -1 CONT 1912 arriving in New York 27 November 1912. He was seventeen years -1 CONT old. On the ship passenger list his trade was listed as a Blacksmith. -1 CONT He came to Reno, Nevada and lived with his sister Marie for a time -1 CONT before settling in Sparks. He worked for Southern Pacific Railroad as -1 CONT a car inspector for a time, then went to work for Standard Oil -1 CONT Company. He enlisted in the army at Sparks 7 December 1917 and served -1 CONT as a Corporal in the Medical Corp until his discharge 12 August 1919 -1 CONT at the Presidio in San Francisco, California. Both he and Marjorie are -1 CONT buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th -1 CONT June 1975, and she the 25th of June 1980. +1 FAMS @F09@ +1 NOTE +2 CONT BIOGRAPHY +2 CONT Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November +2 CONT 1912 arriving in New York 27 November 1912. He was seventeen years +2 CONT old. On the ship passenger list his trade was listed as a Blacksmith. +2 CONT He came to Reno, Nevada and lived with his sister Marie for a time +2 CONT before settling in Sparks. He worked for Southern Pacific Railroad as +2 CONT a car inspector for a time, then went to work for Standard Oil +2 CONT Company. He enlisted in the army at Sparks 7 December 1917 and served +2 CONT as a Corporal in the Medical Corp until his discharge 12 August 1919 +2 CONT at the Presidio in San Francisco, California. Both he and Marjorie are +2 CONT buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th +2 CONT June 1975, and she the 25th of June 1980. +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I13@ INDI +1 REFN 13 1 NAME Gus /Smith/ +2 GIVN Gus +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 11 SEP 1897 @@ -289,10 +252,16 @@ 1 DEAT 2 DATE 21 OCT 1963 2 PLAC San Francisco, San Francisco Co., CA -1 FAMS @F10@ 1 FAMC @F06@ +1 FAMS @F10@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I14@ INDI +1 REFN 14 1 NAME Carl Emil /Smith/ +2 GIVN Carl Emil +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 20 DEC 1899 @@ -301,8 +270,14 @@ 2 DATE 28 JAN 1959 2 PLAC Reno, Washoe Co., NV 1 FAMC @F06@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I15@ INDI +1 REFN 15 1 NAME Hans Peter /Smith/ +2 GIVN Hans Peter +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 17 APR 1904 @@ -310,17 +285,29 @@ 1 DEAT 2 DATE 29 JAN 1977 2 PLAC San Francisco, San Francisco Co., CA +1 FAMC @F06@ 1 FAMS @F11@ 1 FAMS @F15@ -1 FAMC @F06@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I16@ INDI +1 REFN 16 1 NAME Edwin /Willard/ +2 GIVN Edwin +2 SURN Willard 1 SEX M 1 BIRT -2 DATE ABT. 1886 +2 DATE ABT 1886 1 FAMS @F07@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I17@ INDI +1 REFN 17 1 NAME Herman Julius /Nielsen/ +2 GIVN Herman Julius +2 SURN Nielsen 1 SEX M 1 BIRT 2 DATE 31 AUG 1889 @@ -328,31 +315,55 @@ 1 DEAT 2 DATE 1945 1 FAMS @F08@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I18@ INDI +1 REFN 18 1 NAME John Hjalmar /Smith/ +2 GIVN John Hjalmar +2 SURN Smith 2 SOUR @S1601@ 1 SEX M 1 BIRT 2 DATE 30 JAN 1932 2 PLAC San Francisco, San Francisco Co, CA -1 FAMS @F02@ 1 FAMC @F09@ +1 FAMS @F0000@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I19@ INDI +1 REFN 19 1 NAME Marjorie Lee /Smith/ +2 GIVN Marjorie Lee +2 SURN Smith 2 SOUR @S1600@ 1 SEX F 1 BIRT 2 DATE 4 NOV 1934 2 PLAC Reno, Washoe Co. NV 1 FAMC @F09@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I20@ INDI +1 REFN 20 1 NAME Evelyn /Michaels/ +2 GIVN Evelyn +2 SURN Michaels 1 SEX F 1 BIRT -2 DATE ABT. 1897 +2 DATE ABT 1897 1 FAMS @F10@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I21@ INDI +1 REFN 21 1 NAME Jennifer /Anderson/ +2 GIVN Jennifer +2 SURN Anderson 1 SEX F 1 BIRT 2 DATE 5 NOV 1907 @@ -361,8 +372,14 @@ 2 DATE 29 MAY 1985 2 PLAC San Francisco, San Francisco Co., , CA 1 FAMS @F15@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I22@ INDI +1 REFN 22 1 NAME Lillie Harriet /Jones/ +2 GIVN Lillie Harriet +2 SURN Jones 1 SEX F 1 BIRT 2 DATE 2 MAY 1910 @@ -370,8 +387,14 @@ 1 DEAT 2 DATE 26 JUN 1990 1 FAMS @F11@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I23@ INDI +1 REFN 23 1 NAME Magnes /Smith/ +2 GIVN Magnes +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 6 OCT 1858 @@ -379,17 +402,29 @@ 1 DEAT 2 DATE 20 FEB 1910 2 PLAC Ronne, Bornholm, Denmark -1 FAMS @F12@ 1 FAMC @F05@ +1 FAMS @F12@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I24@ INDI +1 REFN 24 1 NAME Emil /Smith/ +2 GIVN Emil +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 27 SEP 1860 2 PLAC Simrishamn, Kristianstad Lan, Sweden 1 FAMC @F05@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I25@ INDI +1 REFN 25 1 NAME Anna /Streiffert/ +2 GIVN Anna +2 SURN Streiffert 1 SEX F 1 BIRT 2 DATE 23 SEP 1860 @@ -398,101 +433,185 @@ 2 DATE 2 FEB 1927 2 PLAC Ronne, Bornholm, Denmark 1 FAMS @F12@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I26@ INDI +1 REFN 26 1 NAME Hanna /Smith/ +2 GIVN Hanna +2 SURN Smith 1 SEX F 1 BIRT 2 DATE 29 JAN 1821 2 PLAC Gladsax, Kristianstad Lan, Sweden 1 FAMC @F03@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I27@ INDI +1 REFN 27 1 NAME Ingar /Smith/ +2 GIVN Ingar +2 SURN Smith 1 SEX F 1 BIRT -2 DATE AFT. 1823 +2 DATE AFT 1823 2 PLAC Gladsax, Kristianstad Lan, Sweden 1 FAMC @F03@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I28@ INDI +1 REFN 28 1 NAME Ingeman /Smith/ +2 GIVN Ingeman +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 29 JAN 1826 2 PLAC Gladsax, Kristianstad Lan, Sweden 1 FAMC @F03@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I29@ INDI +1 REFN 29 1 NAME Marjorie Alice /Smith/ +2 GIVN Marjorie Alice +2 SURN Smith 2 SOUR @S1600@ 1 SEX F 1 BIRT 2 DATE 5 FEB 1960 2 PLAC San Jose, Santa Clara Co., CA -1 FAMC @F02@ +1 FAMC @F0000@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I30@ INDI +1 REFN 30 1 NAME Lloyd /Smith/ +2 GIVN Lloyd +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 13 MAR 1935 2 PLAC San Francisco, San Francisco Co., CA -1 FAMS @F13@ 1 FAMC @F11@ +1 FAMS @F13@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I31@ INDI +1 REFN 31 1 NAME Janis Elaine /Green/ +2 GIVN Janis Elaine +2 SURN Green 1 SEX F 1 BIRT 2 DATE 2 DEC 1935 1 FAMS @F13@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I32@ INDI +1 REFN 32 1 NAME Eric Lloyd /Smith/ +2 GIVN Eric Lloyd +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 28 AUG 1963 2 PLAC San Francisco, San Francisco Co., CA -1 FAMS @F14@ 1 FAMC @F13@ +1 FAMS @F14@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I33@ INDI +1 REFN 33 1 NAME Keith Lloyd /Smith/ +2 GIVN Keith Lloyd +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 11 AUG 1966 2 PLAC San Francisco, San Francisco Co., CA 1 FAMC @F13@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I34@ INDI +1 REFN 34 1 NAME Craig Peter /Smith/ +2 GIVN Craig Peter +2 SURN Smith 1 SEX M 1 BIRT -2 DATE AFT. 1966 +2 DATE AFT 1966 2 PLAC San Francisco, San Francisco Co., CA 1 FAMC @F13@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I35@ INDI +1 REFN 35 1 NAME Lars Peter /Smith/ +2 GIVN Lars Peter +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 16 SEP 1991 2 PLAC Santa Rosa, Sonoma Co., CA 1 FAMC @F14@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I36@ INDI +1 REFN 36 1 NAME Darcy /Horne/ +2 GIVN Darcy +2 SURN Horne 1 SEX F 1 BIRT 2 DATE 2 JUL 1966 2 PLAC Sacramento, Sacramento Co., CA 1 FAMS @F14@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I37@ INDI +1 REFN 37 1 NAME Ingeman /Smith/ +2 GIVN Ingeman +2 SURN Smith 1 SEX M 1 BIRT -2 DATE ABT. 1770 +2 DATE ABT 1770 2 PLAC Sweden -1 FAMS @F04@ +1 FAMS @F0001@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I38@ INDI +1 REFN 38 1 NAME Marta /Ericsdotter/ +2 GIVN Marta +2 SURN Ericsdotter 1 SEX F 1 BIRT -2 DATE ABT. 1775 +2 DATE ABT 1775 2 PLAC Sweden -1 FAMS @F04@ +1 FAMS @F0001@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I39@ INDI +1 REFN 39 1 NAME Marjorie /Ohman/ +2 GIVN Marjorie +2 SURN Ohman 2 SOUR @S1602@ 2 SOUR @S1600@ 1 SEX F @@ -502,22 +621,32 @@ 1 DEAT 2 DATE 22 JUN 1980 2 PLAC Reno, Washoe Co., NV -1 REFN 365 1 FAMS @F09@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I40@ INDI +1 REFN 40 1 NAME Janice Ann /Adams/ +2 GIVN Janice Ann +2 SURN Adams 1 SEX F 1 BIRT 2 DATE 26 AUG 1965 2 PLAC Fremont, Alameda Co., CA -1 OCCU -2 PLAC Retail Manager +1 OCCU Retail Manager 1 _DEG +2 TYPE Business Management 2 DATE 1988 -2 PLAC Business Management 1 FAMS @F01@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I41@ INDI +1 REFN 41 1 NAME Amber Marie /Smith/ +2 GIVN Amber Marie +2 SURN Smith 1 SEX F 1 BIRT 2 DATE 12 APR 1998 @@ -526,8 +655,14 @@ 2 DATE 26 APR 1998 2 PLAC Community Presbyterian Church, Danville, CA 1 FAMC @F01@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I42@ INDI +1 REFN 42 1 NAME Mason Michael /Smith/ +2 GIVN Mason Michael +2 SURN Smith 1 SEX M 1 BIRT 2 DATE 26 JUN 1996 @@ -536,196 +671,261 @@ 2 DATE 10 JUL 1996 2 PLAC Community Presbyterian Church, Danville, CA 1 FAMC @F01@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @I43@ INDI +1 REFN 43 1 NAME Really Old /Guy/ +2 GIVN Really Old +2 SURN Guy 1 SEX M 1 BIRT 2 DATE 26 JUN 34 B.C. 2 PLAC Hayward, Alameda Co., CA +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 +0 @IC3a2b1@ INDI +1 REFN 3 +1 NAME Edwin Michael /Smith/ +2 GIVN Edwin Michael +2 SURN Smith +2 NOTE This is a note attached to a name +2 SOUR @S1600@ +1 SEX M +1 BIRT +2 DATE 24 MAY 1961 +2 PLAC San Jose, Santa Clara Co., CA +1 TITL Grand Poobah +1 OCCU Software Engineer +1 EDUC +2 DATE BET. 1979 - 1984 +2 PLAC UC Berkeley +1 _DEG +2 TYPE B.S.E.E. +2 DATE 1984 +1 None THIS_IS_A_UID +1 None GXXX-XX +1 None MY-RFN +1 SSN 123-456-7890 +1 CAST cast keyword +1 DSCR dscr keyword +1 IDNO idno keyword +1 NATI nati keyword +1 NCHI nchi keyword +1 RESI +2 DATE 1 JAN 1985 +2 ADDR Adr1 line,Adr2 line +3 CITY City line +3 STAE State line +3 POST Post line +2 PHON (123) 456-7890 +2 NOTE This is the residence note +1 FAMC @F0000@ +1 FAMS @F01@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 +0 @F0000@ FAM +1 REFN 0 +1 HUSB @I18@ +1 WIFE @I02@ +1 MARR +2 DATE 4 JUN 1954 +2 PLAC Sparks, Washoe Co., NV +2 SOUR @S0000@ +1 CHIL @IC3a2b1@ +1 CHIL @I29@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 +0 @F0001@ FAM +1 REFN 1 +1 HUSB @I37@ +1 WIFE @I38@ +1 MARR +2 DATE ABT 1790 +2 PLAC Sweden +1 CHIL @I03@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F01@ FAM +1 REFN 1 1 HUSB @IC3a2b1@ 1 WIFE @I40@ -1 CHIL @I42@ -2 _FREL Adopted -2 _MREL Adopted -1 CHIL @I41@ -2 _FREL Natural -2 _MREL Natural 1 MARR 2 DATE 27 MAY 1995 2 PLAC San Ramon, Conta Costa Co., CA 1 ENGA +2 TYPE Engagement of Smith, Edwin Michael and Adams, Janice Ann 2 DATE 5 OCT 1994 2 PLAC San Francisco, CA -0 @F02@ FAM -1 HUSB @I18@ -1 WIFE @I02@ -1 CHIL @I29@ -2 _FREL Adopted -2 _MREL Adopted -1 MARR -2 DATE 4 JUN 1954 -2 PLAC Sparks, Washoe Co., NV -2 SOUR Hannah was the widow of James Matthewson. -1 OBJE -2 FORM jpg -2 FILE test.jpg -2 TITL Random title +1 CHIL @I42@ +1 CHIL @I41@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F03@ FAM +1 REFN 3 1 HUSB @I03@ 1 WIFE @I04@ -1 CHIL @I26@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I27@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I28@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I05@ -2 _FREL Natural -2 _MREL Natural 1 MARR -2 DATE ABT. 1816 +2 DATE ABT 1816 2 PLAC Gladsax, Kristianstad Lan, Sweden -0 @F04@ FAM -1 HUSB @I37@ -1 WIFE @I38@ -1 CHIL @I03@ -2 _FREL Natural -2 _MREL Natural -1 MARR -2 DATE ABT. 1790 -2 PLAC Sweden +1 CHIL @I26@ +1 CHIL @I27@ +1 CHIL @I28@ +1 CHIL @I05@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F05@ FAM +1 REFN 5 1 HUSB @I05@ 1 WIFE @I06@ -1 CHIL @I23@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I24@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I07@ -2 _FREL Natural -2 _MREL Natural 1 MARR -2 DATE ABT. 1856 +2 DATE ABT 1856 +1 CHIL @I23@ +1 CHIL @I24@ +1 CHIL @I07@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F06@ FAM +1 REFN 6 1 HUSB @I07@ 1 WIFE @I08@ -1 CHIL @I09@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I10@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I11@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I12@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I13@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I14@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I15@ -2 _FREL Natural -2 _MREL Natural 1 MARR 2 DATE 27 NOV 1885 2 PLAC Ronne, Bornholm, Denmark +1 CHIL @I09@ +1 CHIL @I10@ +1 CHIL @I11@ +1 CHIL @I12@ +1 CHIL @I13@ +1 CHIL @I14@ +1 CHIL @I15@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F07@ FAM +1 REFN 7 1 HUSB @I16@ 1 WIFE @I09@ 1 MARR -2 DATE ABT. 1910 +2 DATE ABT 1910 +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F08@ FAM +1 REFN 8 1 HUSB @I17@ 1 WIFE @I10@ 1 MARR 2 DATE 30 NOV 1912 2 PLAC Ronne, Bornholm, Denmark +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F09@ FAM +1 REFN 9 1 HUSB @I12@ 1 WIFE @I39@ -1 CHIL @I18@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I19@ -2 _FREL Natural -2 _MREL Natural 1 MARR 2 DATE 31 OCT 1927 2 PLAC Reno, Washoe Co., NV +1 CHIL @I18@ +1 CHIL @I19@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F10@ FAM +1 REFN 10 1 HUSB @I13@ 1 WIFE @I20@ 1 MARR -2 DATE ABT. 1920 +2 DATE ABT 1920 +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F11@ FAM +1 REFN 11 1 HUSB @I15@ 1 WIFE @I22@ 1 CHIL @I30@ -2 _FREL Adopted -2 _MREL Adopted +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F12@ FAM +1 REFN 12 1 HUSB @I23@ 1 WIFE @I25@ 1 MARR 2 DATE 24 AUG 1884 2 PLAC Ronne, Bornholm, Denmark +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F13@ FAM +1 REFN 13 1 HUSB @I30@ 1 WIFE @I31@ -1 CHIL @I32@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I33@ -2 _FREL Natural -2 _MREL Natural -1 CHIL @I34@ -2 _FREL Natural -2 _MREL Natural 1 MARR 2 DATE 10 AUG 1958 2 PLAC San Francisco, San Francisco Co., CA +1 CHIL @I32@ +1 CHIL @I33@ +1 CHIL @I34@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F14@ FAM +1 REFN 14 1 HUSB @I32@ 1 WIFE @I36@ -1 CHIL @I35@ -2 _FREL Natural -2 _MREL Natural 1 MARR +2 DATE 12 JUL 1986 +2 PLAC Woodland, Yolo Co., CA 2 HUSB 3 AGE 30y 2 WIFE 3 AGE 330y -2 DATE 12 JUL 1986 -2 PLAC Woodland, Yolo Co., CA +1 CHIL @I35@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @F15@ FAM +1 REFN 15 1 HUSB @I15@ 1 WIFE @I21@ +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 +0 @S0000@ SOUR +1 TITL Hannah was the widow of James Matthewson. +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @S1600@ SOUR 1 TITL Birth Certificate 1 REPO @R00@ -2 CALN -3 MEDI Book +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @S1601@ SOUR -1 TITL Birth Record -2 CONC s +1 TITL Birth Record s 1 REPO @R00@ -2 CALN -3 MEDI Book +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @S1602@ SOUR 1 TITL Birth, Death and Marriage Records 1 REPO @R00@ -2 CALN -3 MEDI Book +1 CHAN +2 DATE 17 APR 2007 +3 TIME 20:57:00 0 @R00@ REPO 1 NAME Repository Name 1 ADDR Repository Address diff --git a/src/DbManager.py b/src/DbManager.py index 65a0423f9..dbc064252 100644 --- a/src/DbManager.py +++ b/src/DbManager.py @@ -64,7 +64,7 @@ import QuestionDialog # constants # #------------------------------------------------------------------------- -DEFAULT_DIR = os.path.join(const.home_dir,"grampsdb") +DEFAULT_DIR = os.path.join(const.home_dir, "grampsdb") DEFAULT_TITLE = _("Family Tree") NAME_FILE = "name.txt" META_NAME = "meta_data.db" diff --git a/src/DisplayModels/_BaseModel.py b/src/DisplayModels/_BaseModel.py index 594f48cb7..e471b2bd8 100644 --- a/src/DisplayModels/_BaseModel.py +++ b/src/DisplayModels/_BaseModel.py @@ -254,7 +254,7 @@ class BaseModel(gtk.GenericTreeModel): self.node_map.clear_map() def add_row_by_handle(self,handle): - if self.search and self.search.match(handle): + if not self.search or (self.search and self.search.match(handle)): data = self.map(handle) key = locale.strxfrm(self.sort_func(data)) diff --git a/src/GrampsDbUtils/_GedcomLex.py b/src/GrampsDbUtils/_GedcomLex.py index 31a44aa5e..47ffda9ae 100644 --- a/src/GrampsDbUtils/_GedcomLex.py +++ b/src/GrampsDbUtils/_GedcomLex.py @@ -79,9 +79,9 @@ for __val in personalConstantAttributes.keys(): #------------------------------------------------------------------------- MOD = re.compile(r"\s*(INT|EST|CAL)\s+(.*)$") -CAL = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D([^@]+)@\s*(.*)$") -RANGE = re.compile(r"\s*BET\s+@#D([^@]+)@\s*(.*)\s+AND\s+@#D([^@]+)@\s*(.*)$") -SPAN = re.compile(r"\s*FROM\s+@#D([^@]+)@\s*(.*)\s+TO\s+@#D([^@]+)@\s*(.*)$") +CAL = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D?([^@]+)@\s*(.*)$") +RANGE = re.compile(r"\s*BET\s+@#D?([^@]+)@\s*(.*)\s+AND\s+@#D?([^@]+)@\s*(.*)$") +SPAN = re.compile(r"\s*FROM\s+@#D?([^@]+)@\s*(.*)\s+TO\s+@#D?([^@]+)@\s*(.*)$") CALENDAR_MAP = { "FRENCH R" : RelLib.Date.CAL_FRENCH, @@ -296,7 +296,10 @@ def extract_date(text): match = CAL.match(text) if match: (abt, cal, data) = match.groups() - dateobj = DATE_CNV.parse("%s %s" % (abt, data)) + if abt: + dateobj = DATE_CNV.parse("%s %s" % (abt, data)) + else: + dateobj = DATE_CNV.parse(data) dateobj.set_calendar(CALENDAR_MAP.get(cal, RelLib.Date.CAL_GREGORIAN)) dateobj.set_quality(qual) diff --git a/src/GrampsDbUtils/_WriteGedcom.py b/src/GrampsDbUtils/_WriteGedcom.py index 4450c4cf0..ba6392375 100644 --- a/src/GrampsDbUtils/_WriteGedcom.py +++ b/src/GrampsDbUtils/_WriteGedcom.py @@ -105,9 +105,9 @@ _month = [ "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ] _calmap = { - RelLib.Date.CAL_HEBREW : (_hmonth, '@#HEBREW@'), - RelLib.Date.CAL_FRENCH : (_fmonth, '@#FRENCH R@'), - RelLib.Date.CAL_JULIAN : (_month, '@#JULIAN@'), + RelLib.Date.CAL_HEBREW : (_hmonth, '@#DHEBREW@'), + RelLib.Date.CAL_FRENCH : (_fmonth, '@#DFRENCH R@'), + RelLib.Date.CAL_JULIAN : (_month, '@#DJULIAN@'), } _caldef = {