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

Fixed gedcom generation of RESI

Browse Source 
svn: r551
This commit is contained in:
Don Allingham 2001-11-04 23:33:39 +00:00
parent 4d605ac383
commit d3ce0ee54b
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/src/plugins/ReadGedcom.py
View File

@ -907,6 +907,10 @@ class GedcomParser:
source_ref.setBase(self.db.findSource(matches[2],self.smap)) source_ref.setBase(self.db.findSource(matches[2],self.smap))
address.addSourceRef(source_ref) address.addSourceRef(source_ref)
self.parse_source_reference(source_ref,level+1) self.parse_source_reference(source_ref,level+1)
elif matches[1] == "ADDR":
self.addr = Address()
self.addr.setStreet(matches[2] + self.parse_continue_data(2))
self.parse_address(self.addr,2)
elif matches[1] == "PLAC": elif matches[1] == "PLAC":
address.setStreet(matches[2]) address.setStreet(matches[2])
self.parse_address(address,level+1) self.parse_address(address,level+1)

21
gramps/src/plugins/WriteGedcom.py
View File

@ -403,12 +403,12 @@ def write_person(g,person):
g.write("0 @I%s@ INDI\n" % person.getId()) g.write("0 @I%s@ INDI\n" % person.getId())
write_person_name(g,person.getPrimaryName(),person.getNickName()) write_person_name(g,person.getPrimaryName(),person.getNickName())
for name in person.getAlternateNames(): # for name in person.getAlternateNames():
write_person_name(g,name,"") # write_person_name(g,name,"")
if person.getGender() == Person.male: if person.getGender() == Person.male:
g.write("1 SEX M\n") g.write("1 SEX M\n")
else: elif person.getGender() == Person.female:
g.write("1 SEX F\n") g.write("1 SEX F\n")
if not probably_alive(person): if not probably_alive(person):
@ -466,19 +466,20 @@ def write_person(g,person):
for addr in person.getAddressList(): for addr in person.getAddressList():
if private and addr.getPrivacy(): if private and addr.getPrivacy():
continue continue
write_long_text(g,"RESI",1,addr.getStreet()) g.write("1 RESI\n")
write_long_text(g,"ADDR",2,addr.getStreet())
if addr.getCity() != "": if addr.getCity() != "":
g.write("2 CITY %s\n" % addr.getCity()) g.write("3 CITY %s\n" % addr.getCity())
if addr.getState() != "": if addr.getState() != "":
g.write("2 STAE %s\n" % addr.getState()) g.write("3 STAE %s\n" % addr.getState())
if addr.getPostal() != "": if addr.getPostal() != "":
g.write("2 POST %s\n" % addr.getPostal()) g.write("3 POST %s\n" % addr.getPostal())
if addr.getCountry() != "": if addr.getCountry() != "":
g.write("2 CTRY %s\n" % addr.getCountry()) g.write("3 CTRY %s\n" % addr.getCountry())
if addr.getNote() != "": if addr.getNote() != "":
write_long_text(g,"NOTE",2,addr.getNote()) write_long_text(g,"NOTE",3,addr.getNote())
for srcref in addr.getSourceRefList(): for srcref in addr.getSourceRefList():
write_source_ref(g,2,srcref) write_source_ref(g,3,srcref)
family = person.getMainFamily() family = person.getMainFamily()
if family != None and family in family_list: if family != None and family in family_list: