Delete remove_source_references and replace_source_references as they are no longer needed.

Rename remove_citation to remove_citation_refs and make it apply to a citation_handle_list.
Updated tool/Check.py to change check_source_references into check_citation_references


svn: r18433
This commit is contained in:
Tim G L Lyons
2011-11-11 17:12:43 +00:00
parent b4f434357f
commit f8f510d5f1
12 changed files with 109 additions and 198 deletions

View File

@@ -449,41 +449,41 @@ class DeleteCitationQuery(object):
(person_list, family_list, event_list, place_list, source_list,
media_list, repo_list) = self.the_lists
ctn_handle = self.citation.get_handle()
ctn_handle_list = [self.citation.get_handle()]
for handle in person_list:
person = self.db.get_person_from_handle(handle)
person.remove_citation(ctn_handle)
person.remove_citation_refs(ctn_handle_list)
self.db.commit_person(person, trans)
for handle in family_list:
family = self.db.get_family_from_handle(handle)
family.remove_citation(ctn_handle)
family.remove_citation_refs(ctn_handle_list)
self.db.commit_family(family, trans)
for handle in event_list:
event = self.db.get_event_from_handle(handle)
event.remove_citation(ctn_handle)
event.remove_citation_refs(ctn_handle_list)
self.db.commit_event(event, trans)
for handle in place_list:
place = self.db.get_place_from_handle(handle)
place.remove_citation(ctn_handle)
place.remove_citation_refs(ctn_handle_list)
self.db.commit_place(place, trans)
for handle in source_list:
source = self.db.get_source_from_handle(handle)
source.remove_citation(ctn_handle)
source.remove_citation_refs(ctn_handle_list)
self.db.commit_source(source, trans)
for handle in media_list:
media = self.db.get_object_from_handle(handle)
media.remove_citation(ctn_handle)
media.remove_citation_refs(ctn_handle_list)
self.db.commit_media_object(media, trans)
for handle in repo_list:
repo = self.db.get_repository_from_handle(handle)
repo.remove_citation(ctn_handle)
repo.remove_citation_refs(ctn_handle_list)
self.db.commit_repository(repo, trans)
self.db.enable_signals()

View File

@@ -241,40 +241,42 @@ class DeleteSrcQuery(object):
(citation_handle, refs))
(person_list, family_list, event_list, place_list, source_list,
media_list, repo_list) = refs
ctn_handle_list = [citation_handle]
for handle in person_list:
person = self.db.get_person_from_handle(handle)
person.remove_citation(citation_handle)
person.remove_citation_refs(ctn_handle_list)
self.db.commit_person(person, trans)
for handle in family_list:
family = self.db.get_family_from_handle(handle)
family.remove_citation(citation_handle)
family.remove_citation_refs(ctn_handle_list)
self.db.commit_family(family, trans)
for handle in event_list:
event = self.db.get_event_from_handle(handle)
event.remove_citation(citation_handle)
event.remove_citation_refs(ctn_handle_list)
self.db.commit_event(event, trans)
for handle in place_list:
place = self.db.get_place_from_handle(handle)
place.remove_citation(citation_handle)
place.remove_citation_refs(ctn_handle_list)
self.db.commit_place(place, trans)
for handle in source_list:
source = self.db.get_source_from_handle(handle)
source.remove_citation(citation_handle)
source.remove_citation_refs(ctn_handle_list)
self.db.commit_source(source, trans)
for handle in media_list:
media = self.db.get_object_from_handle(handle)
media.remove_citation(citation_handle)
media.remove_citation_refs(ctn_handle_list)
self.db.commit_media_object(media, trans)
for handle in repo_list:
repo = self.db.get_repository_from_handle(handle)
repo.remove_citation(citation_handle)
repo.remove_citation_refs(ctn_handle_list)
self.db.commit_repository(repo, trans)
# (2) delete the actual citations