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

* GenericFilter.py: Don't crash on corrupt database

Browse Source 
svn: r4382
This commit is contained in:
Martin Hawlisch 2005-04-19 19:34:22 +00:00
parent 6c9aedeaf7
commit c1e1f31ace
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/ChangeLog
View File

@ -4,6 +4,7 @@
* src/gramps_main.py: Removed canvas specific calls of the PedView * 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 * 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> 2005-04-18 Don Allingham <don@gramps-project.org>
* src/edit_person.glade: re-add edit_person.glade * src/edit_person.glade: re-add edit_person.glade

4
gramps2/src/GenericFilter.py
View File

@ -1950,7 +1950,7 @@ class HasTextMatchingSubstringOf(Rule):
event = self.db.get_event_from_handle(event_handle) event = self.db.get_event_from_handle(event_handle)
if self.match_object(event): if self.match_object(event):
match = 1 match = 1
else: elif event:
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
if self.search_place(place_handle): if self.search_place(place_handle):
@ -1985,6 +1985,8 @@ class HasTextMatchingSubstringOf(Rule):
self.place_map[handle] = 1 self.place_map[handle] = 1
def match_object(self,obj): def match_object(self,obj):
if not obj:
return 0
if self.regexp_match: if self.regexp_match:
return obj.matches_regexp(self.list[0],self.case_sensitive) return obj.matches_regexp(self.list[0],self.case_sensitive)
return obj.matches_string(self.list[0],self.case_sensitive) return obj.matches_string(self.list[0],self.case_sensitive)