* GenericFilter.py: Don't crash on corrupt database
svn: r4382
This commit is contained in:
parent
6c9aedeaf7
commit
c1e1f31ace
@ -4,6 +4,7 @@
|
||||
* src/gramps_main.py: Removed canvas specific calls of the PedView
|
||||
|
||||
* src/GrampsDbBase.py (create_id): Use sys.maxint to get the maximum possible integer number
|
||||
* GenericFilter.py: Don't crash on corrupt database
|
||||
|
||||
2005-04-18 Don Allingham <don@gramps-project.org>
|
||||
* src/edit_person.glade: re-add edit_person.glade
|
||||
|
@ -1950,7 +1950,7 @@ class HasTextMatchingSubstringOf(Rule):
|
||||
event = self.db.get_event_from_handle(event_handle)
|
||||
if self.match_object(event):
|
||||
match = 1
|
||||
else:
|
||||
elif event:
|
||||
place_handle = event.get_place_handle()
|
||||
if place_handle:
|
||||
if self.search_place(place_handle):
|
||||
@ -1985,6 +1985,8 @@ class HasTextMatchingSubstringOf(Rule):
|
||||
self.place_map[handle] = 1
|
||||
|
||||
def match_object(self,obj):
|
||||
if not obj:
|
||||
return 0
|
||||
if self.regexp_match:
|
||||
return obj.matches_regexp(self.list[0],self.case_sensitive)
|
||||
return obj.matches_string(self.list[0],self.case_sensitive)
|
||||
|
Loading…
Reference in New Issue
Block a user