* src/GrampsDb/_ReadGedcom.py: issue #1169, wrong GEDCOM parse ADDR



svn: r9080
This commit is contained in:
Benny Malengier
2007-10-05 09:42:09 +00:00
parent cf5ae68625
commit 5bdeeeb762
2 changed files with 14 additions and 13 deletions

View File

@ -1,3 +1,6 @@
2007-10-05 Benny Malengier <benny.malengier@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: issue #1169, wrong GEDCOM parse ADDR
2007-10-05 James G. Sack <jgsack@san.rr.com> 2007-10-05 James G. Sack <jgsack@san.rr.com>
* src/GrampsDb/_GrampsDbBase.py: * src/GrampsDb/_GrampsDbBase.py:
* src/GrampsDb/_GrampsGEDDB.py: * src/GrampsDb/_GrampsGEDDB.py:

View File

@ -1969,14 +1969,12 @@ class GedcomParser(UpdateCallback):
if place_handle: if place_handle:
place = self.db.get_place_from_handle(place_handle) place = self.db.get_place_from_handle(place_handle)
main_loc = place.get_main_location() main_loc = place.get_main_location()
try: if main_loc and location and \
if main_loc and main_loc.get_street() != location.get_street(): main_loc.get_street() != location.get_street():
old_title = place.get_title() old_title = place.get_title()
place = self.find_or_create_place(index) place = self.find_or_create_place(index)
place.set_title(old_title) place.set_title(old_title)
place_handle = place.handle place_handle = place.handle
except:
print matches
else: else:
place = self.find_or_create_place(index) place = self.find_or_create_place(index)
place.set_title(matches[2]) place.set_title(matches[2])