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

2006-12-16 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadGedcom.py: proper handling of unknown source tags



svn: r7810
This commit is contained in:
Don Allingham 2006-12-16 22:36:32 +00:00
parent 52bc623ab2
commit 53863807a0
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2006-12-16 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: proper handling of unknown source tags (bug #654)
2006-12-15 Don Allingham <don@gramps-project.org> 2006-12-15 Don Allingham <don@gramps-project.org>
* src/GrampsWidgets.py (PlaceEntry.set_button): fix tooltips (bug #764) * src/GrampsWidgets.py (PlaceEntry.set_button): fix tooltips (bug #764)
* src/glade/gramps.glade: remove static tooltip * src/glade/gramps.glade: remove static tooltip

14
src/GrampsDb/_ReadGedcom.py
View File

@ -941,7 +941,7 @@ class GedcomParser(UpdateCallback):
self.db.commit_source(self.source, self.trans) self.db.commit_source(self.source, self.trans)
def func_source_undef(self, matches, source, level): def func_source_undef(self, matches, source, level):
self.not_recognized(level) self.not_recognized(level+1)
def func_source_ignore(self, matches, source, level): def func_source_ignore(self, matches, source, level):
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
@ -1412,6 +1412,13 @@ class GedcomParser(UpdateCallback):
(form, filename, title, note) = self.parse_obje(level) (form, filename, title, note) = self.parse_obje(level)
self.build_media_object(event, form, filename, title, note) self.build_media_object(event, form, filename, title, note)
def func_place_object(self, matches, place, level):
if matches[2] and matches[2][0] == '@':
self.not_recognized(level)
else:
(form, filename, title, note) = self.parse_obje(level)
self.build_media_object(place, form, filename, title, note)
def func_source_object(self, matches, source, level): def func_source_object(self, matches, source, level):
if matches[2] and matches[2][0] == '@': if matches[2] and matches[2][0] == '@':
self.not_recognized(level) self.not_recognized(level)
@ -1758,7 +1765,6 @@ class GedcomParser(UpdateCallback):
while True: while True:
matches = self.get_next() matches = self.get_next()
if self.level_is_finished(matches,level): if self.level_is_finished(matches,level):
break break
elif matches[1] in (TOKEN_ADDR, TOKEN_ADR1, TOKEN_ADR2): elif matches[1] in (TOKEN_ADDR, TOKEN_ADR1, TOKEN_ADR2):
@ -1963,6 +1969,7 @@ class GedcomParser(UpdateCallback):
+1 <<SOURCE_CITATION>> {0:M} +1 <<SOURCE_CITATION>> {0:M}
+1 <<NOTE_STRUCTURE>> {0:M} +1 <<NOTE_STRUCTURE>> {0:M}
""" """
val = matches[2] val = matches[2]
n = event.get_type() n = event.get_type()
if self.is_ftw and int(n) in [RelLib.EventType.OCCUPATION, if self.is_ftw and int(n) in [RelLib.EventType.OCCUPATION,
@ -1982,10 +1989,11 @@ class GedcomParser(UpdateCallback):
elif matches[1] == TOKEN_NOTE: elif matches[1] == TOKEN_NOTE:
note = self.parse_note(matches, place, level+1, '') note = self.parse_note(matches, place, level+1, '')
place.set_note(note) place.set_note(note)
elif matches[1] == TOKEN_OBJE:
self.func_place_object(matches, place, level+1)
elif matches[1] == TOKEN_SOUR: elif matches[1] == TOKEN_SOUR:
place.add_source_reference( place.add_source_reference(
self.handle_source(matches,level+1)) self.handle_source(matches,level+1))
self.db.commit_place(place, self.trans) self.db.commit_place(place, self.trans)
def func_event_cause(self, matches, event_ref, event, level): def func_event_cause(self, matches, event_ref, event, level):