Fixed parsing of addresses

svn: r398
This commit is contained in:
Don Allingham 2001-09-10 00:54:30 +00:00
parent 7f3e2d9352
commit 340c1fa00e
3 changed files with 1288 additions and 859 deletions

View File

@ -331,7 +331,7 @@ def store_researcher(res):
def on_propertybox_help(obj,page): def on_propertybox_help(obj,page):
import gnome.help import gnome.help
gnome.help.display("gramps","preferences.html#prefs_tab%d" % page) gnome.help.display('gramps-manual','prefs.html')
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -830,15 +830,15 @@ class GedcomParser:
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[1] + self.parse_continue_data(1) note = matches[1] + self.parse_continue_data(1)
self.address.setNote(note) address.setNote(note)
self.ignore_sub_junk(2) self.ignore_sub_junk(2)
else: else:
if self.nmap.has_key(matches[2]): if self.nmap.has_key(matches[2]):
self.address.setNoteObj(self.nmap[matches[2]]) address.setNoteObj(self.nmap[matches[2]])
else: else:
noteobj = Note() noteobj = Note()
self.nmap[matches[2]] = noteobj self.nmap[matches[2]] = noteobj
self.address.setNoteObj(noteobj) address.setNoteObj(noteobj)
else: else:
self.barf(level+1) self.barf(level+1)

File diff suppressed because it is too large Load Diff