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

0005058: Note reference on Attribute for individual is not filtered on Export. Fixed many other note references that are not filtered out.

Browse Source 
svn: r21522
This commit is contained in:
Tim G L Lyons 2013-03-02 19:29:32 +00:00
parent 90fbb2fdf7
commit 97e29dade6
1 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/gen/proxy/filter.py
View File

@ -140,8 +140,20 @@ class FilterProxyDb(ProxyDbBase):
""" """
source = self.db.get_source_from_handle(handle) source = self.db.get_source_from_handle(handle)
# Filter notes out # Filter notes out
self.sanitize_notebase(source) self.sanitize_notebase(source)
media_ref_list = source.get_media_list()
for media_ref in media_ref_list:
self.sanitize_notebase(media_ref)
attributes = media_ref.get_attribute_list()
for attribute in attributes:
self.sanitize_notebase(attribute)
repo_ref_list = source.get_reporef_list()
for repo_ref in repo_ref_list:
self.sanitize_notebase(repo_ref)
return source return source
def get_citation_from_handle(self, handle): def get_citation_from_handle(self, handle):
@ -163,6 +175,11 @@ class FilterProxyDb(ProxyDbBase):
media = self.db.get_object_from_handle(handle) media = self.db.get_object_from_handle(handle)
# Filter notes out # Filter notes out
self.sanitize_notebase(media) self.sanitize_notebase(media)
attributes = media.get_attribute_list()
for attr in attributes:
self.sanitize_notebase(attr)
return media return media
def get_place_from_handle(self, handle): def get_place_from_handle(self, handle):
@ -173,6 +190,14 @@ class FilterProxyDb(ProxyDbBase):
place = self.db.get_place_from_handle(handle) place = self.db.get_place_from_handle(handle)
# Filter notes out # Filter notes out
self.sanitize_notebase(place) self.sanitize_notebase(place)
media_ref_list = place.get_media_list()
for media_ref in media_ref_list:
self.sanitize_notebase(media_ref)
attributes = media_ref.get_attribute_list()
for attribute in attributes:
self.sanitize_notebase(attribute)
return place return place
def get_event_from_handle(self, handle): def get_event_from_handle(self, handle):
@ -212,7 +237,33 @@ class FilterProxyDb(ProxyDbBase):
family.set_child_ref_list(clist) family.set_child_ref_list(clist)
# Filter notes out # Filter notes out
for cref in clist:
self.sanitize_notebase(cref)
self.sanitize_notebase(family) self.sanitize_notebase(family)
attributes = family.get_attribute_list()
for attr in attributes:
self.sanitize_notebase(attr)
event_ref_list = family.get_event_ref_list()
for event_ref in event_ref_list:
self.sanitize_notebase(event_ref)
attributes = event_ref.get_attribute_list()
for attribute in attributes:
self.sanitize_notebase(attribute)
media_ref_list = family.get_media_list()
for media_ref in media_ref_list:
self.sanitize_notebase(media_ref)
attributes = media_ref.get_attribute_list()
for attribute in attributes:
self.sanitize_notebase(attribute)
lds_ord_list = family.get_lds_ord_list()
for lds_ord in lds_ord_list:
self.sanitize_notebase(lds_ord)
return family return family
else: else:
return None return None
@ -500,3 +551,29 @@ class FilterProxyDb(ProxyDbBase):
self.sanitize_notebase(name) self.sanitize_notebase(name)
self.sanitize_addressbase(person) self.sanitize_addressbase(person)
attributes = person.get_attribute_list()
for attr in attributes:
self.sanitize_notebase(attr)
event_ref_list = person.get_event_ref_list()
for event_ref in event_ref_list:
self.sanitize_notebase(event_ref)
attributes = event_ref.get_attribute_list()
for attribute in attributes:
self.sanitize_notebase(attribute)
media_ref_list = person.get_media_list()
for media_ref in media_ref_list:
self.sanitize_notebase(media_ref)
attributes = media_ref.get_attribute_list()
for attribute in attributes:
self.sanitize_notebase(attribute)
lds_ord_list = person.get_lds_ord_list()
for lds_ord in lds_ord_list:
self.sanitize_notebase(lds_ord)
person_ref_list = person.get_person_ref_list()
for person_ref in person_ref_list:
self.sanitize_notebase(person_ref)