* src/plugins/Check.py: Fix events, that reference non existing places

svn: r4342
This commit is contained in:
Martin Hawlisch 2005-04-11 10:11:04 +00:00
parent 78fcabe770
commit 88e5406249
2 changed files with 22 additions and 1 deletions

View File

@ -1,6 +1,8 @@
2005-04-11 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-04-11 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/PedView.py (load_canvas): Catch bug of not existing family * src/PedView.py (load_canvas): Catch bug of not existing family
* src/plugins/Check.py: Fix events, that reference non existing places
2005-04-10 Alex Roitman <shura@gramps-project.org> 2005-04-10 Alex Roitman <shura@gramps-project.org>
* Release: Version 1.1.95 "When danger reared its ugly head, * Release: Version 1.1.95 "When danger reared its ugly head,
he bravely turned his tail and fled" released. he bravely turned his tail and fled" released.

View File

@ -66,6 +66,7 @@ def runTool(database,active_person,callback,parent=None):
checker.check_parent_relationships() checker.check_parent_relationships()
checker.cleanup_empty_families(0) checker.cleanup_empty_families(0)
checker.check_events() checker.check_events()
checker.check_place_references()
database.transaction_commit(trans, _("Check Integrity")) database.transaction_commit(trans, _("Check Integrity"))
database.enable_signals() database.enable_signals()
database.request_rebuild() database.request_rebuild()
@ -98,6 +99,7 @@ class CheckIntegrity:
self.invalid_events = [] self.invalid_events = []
self.invalid_birth_events = [] self.invalid_birth_events = []
self.invalid_death_events = [] self.invalid_death_events = []
self.invalid_place_references = []
def check_for_broken_family_links(self): def check_for_broken_family_links(self):
self.broken_links = [] self.broken_links = []
@ -380,6 +382,18 @@ class CheckIntegrity:
self.db.commit_person(person,self.trans) self.db.commit_person(person,self.trans)
self.invalid_events.append(key) self.invalid_events.append(key)
def check_place_references(self):
for key in self.db.get_event_handles():
event = self.db.get_event_from_handle(key)
place_handle = event.get_place_handle()
if place_handle:
place = self.db.get_place_from_handle(place_handle)
if not place:
# The referenced place does not exist in the database
event.set_place_handle("")
self.db.commit_event(event,self.trans)
self.invalid_place_references.append(key)
def build_report(self,cl=0): def build_report(self,cl=0):
bad_photos = len(self.bad_photo) bad_photos = len(self.bad_photo)
replaced_photos = len(self.replaced_photo) replaced_photos = len(self.replaced_photo)
@ -393,8 +407,9 @@ class CheckIntegrity:
birth_invalid = len(self.invalid_birth_events) birth_invalid = len(self.invalid_birth_events)
death_invalid = len(self.invalid_death_events) death_invalid = len(self.invalid_death_events)
person = birth_invalid + death_invalid person = birth_invalid + death_invalid
place_references = len(self.invalid_place_references)
errors = blink + efam + photos + rel + person + event_invalid errors = blink + efam + photos + rel + person + event_invalid + place_references
if errors == 0: if errors == 0:
if cl: if cl:
@ -477,6 +492,10 @@ class CheckIntegrity:
self.text.write(_("1 invalid death event name was fixed\n")) self.text.write(_("1 invalid death event name was fixed\n"))
elif death_invalid > 1: elif death_invalid > 1:
self.text.write(_("%d invalid death event names were fixed\n") % death_invalid) self.text.write(_("%d invalid death event names were fixed\n") % death_invalid)
if place_references == 1:
self.text.write(_("1 place was referenced but not found\n"))
elif place_references > 1:
self.text.write(_("%d places were referenced, but not found\n") % place_references)
return errors return errors