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

* src/plugins/WriteGedcom.py (export_data): Correct researcher's

Browse Source 
PHON field; (write_person): Correct exported PHON fields.
* src/plugins/ReadGedcom.py (parse_residence): Remove PHON field since
it is taken care of by parse_address() now;
(parse_address): Parse PHON field, provided it immediately follows
ADDR structure.


svn: r2489
This commit is contained in:
Alex Roitman
2003-12-10 02:07:05 +00:00
parent 11f4d9c2f4
commit 3e9026bba7
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/WriteGedcom.py
View File

@@ -630,11 +630,10 @@ class GedcomWriter:
if owner.getCountry():
self.writeln("2 CONT %s" % self.cnvtxt(owner.getCountry()))
cnt = 1
if owner.getPhone():
self.writeln("2 PHON %s" % self.cnvtxt(owner.getPhone()))
cnt = 1
if cnt == 0:
self.writeln('2 CONT Not Provided')
if owner.getPhone():
self.writeln("1 PHON %s" % self.cnvtxt(owner.getPhone()))
else:
self.writeln('1 ADDR Not Provided')
self.writeln('2 CONT Not Provided')
@@ -933,12 +932,15 @@ class GedcomWriter:
self.writeln("3 POST %s" % self.cnvtxt(addr.getPostal()))
if addr.getCountry():
self.writeln("3 CTRY %s" % self.cnvtxt(addr.getCountry()))
if addr.getPhone():
self.writeln("2 PHON %s" % self.cnvtxt(addr.getPhone()))
else:
text = addr.getStreet()
text = addr_append(text,addr.getCity())
text = addr_append(text,addr.getState())
text = addr_append(text,addr.getPostal())
text = addr_append(text,addr.getCountry())
text = addr_append(text,addr.getPhone())
if text:
self.writeln("2 PLAC %s" % string.replace(self.cnvtxt(text),'\r',' '))
if addr.getNote():