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

bug 6130; fix export filtering (#380)

Browse Source
This commit is contained in:
Paul Culley
2017-05-15 18:52:23 -05:00
committed by Sam Manzi
parent 61526190e6
commit fa46fe189b
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gramps/gen/proxy/filter.py
View File

@@ -78,6 +78,8 @@ class FilterProxyDb(ProxyDbBase):
Finds a Person in the database from the passed Gramps ID. Finds a Person in the database from the passed Gramps ID.
If no such Person exists, None is returned. If no such Person exists, None is returned.
""" """
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
if handle in self.plist: if handle in self.plist:
person = self.db.get_person_from_handle(handle) person = self.db.get_person_from_handle(handle)
if person is None: if person is None:
@@ -115,15 +117,23 @@ class FilterProxyDb(ProxyDbBase):
return None return None
def include_person(self, handle): def include_person(self, handle):
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
return handle in self.plist return handle in self.plist
def include_family(self, handle): def include_family(self, handle):
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
return handle in self.flist return handle in self.flist
def include_event(self, handle): def include_event(self, handle):
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
return handle in self.elist return handle in self.elist
def include_note(self, handle): def include_note(self, handle):
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
return handle in self.nlist return handle in self.nlist
def get_source_from_handle(self, handle): def get_source_from_handle(self, handle):
@@ -202,6 +212,8 @@ class FilterProxyDb(ProxyDbBase):
Finds a Event in the database from the passed Gramps ID. Finds a Event in the database from the passed Gramps ID.
If no such Event exists, None is returned. If no such Event exists, None is returned.
""" """
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
if handle in self.elist: if handle in self.elist:
event = self.db.get_event_from_handle(handle) event = self.db.get_event_from_handle(handle)
# Filter all notes out # Filter all notes out
@@ -215,6 +227,8 @@ class FilterProxyDb(ProxyDbBase):
Finds a Family in the database from the passed Gramps ID. Finds a Family in the database from the passed Gramps ID.
If no such Family exists, None is returned. If no such Family exists, None is returned.
""" """
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
if handle in self.flist: if handle in self.flist:
family = self.db.get_family_from_handle(handle) family = self.db.get_family_from_handle(handle)
if family is None: if family is None:
@@ -281,6 +295,8 @@ class FilterProxyDb(ProxyDbBase):
Finds a Note in the database from the passed Gramps ID. Finds a Note in the database from the passed Gramps ID.
If no such Note exists, None is returned. If no such Note exists, None is returned.
""" """
if isinstance(handle, bytes):
handle = str(handle, 'utf-8')
if handle in self.nlist: if handle in self.nlist:
return self.db.get_note_from_handle(handle) return self.db.get_note_from_handle(handle)
else: else: