diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index c5c9a349e..813b0777c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2006-08-09 Alex Roitman + * src/Filters/Rules/_HasNoteSubstrBase.py (apply): Enforce unicode. + * src/Filters/Rules/_HasNoteRegexBase.py (apply): Enforce unicode. * src/DataViews/_PlaceView.py: Add filter sidebar. * src/FilterEditor/_ShowResults.py: Support media filters. * src/FilterEditor/_EditRule.py: Support media filters. diff --git a/gramps2/src/Filters/Rules/_HasNoteRegexBase.py b/gramps2/src/Filters/Rules/_HasNoteRegexBase.py index 2159d7385..b569e24af 100644 --- a/gramps2/src/Filters/Rules/_HasNoteRegexBase.py +++ b/gramps2/src/Filters/Rules/_HasNoteRegexBase.py @@ -56,5 +56,5 @@ class HasNoteRegexBase(Rule): self.match = re.compile('') def apply(self,db,person): - n = person.get_note() + n = unicode(person.get_note()) return self.match.match(n) != None diff --git a/gramps2/src/Filters/Rules/_HasNoteSubstrBase.py b/gramps2/src/Filters/Rules/_HasNoteSubstrBase.py index 9123abb32..6a2d42ea5 100644 --- a/gramps2/src/Filters/Rules/_HasNoteSubstrBase.py +++ b/gramps2/src/Filters/Rules/_HasNoteSubstrBase.py @@ -46,7 +46,7 @@ class HasNoteSubstrBase(Rule): category = _('General filters') def apply(self,db,person): - n = person.get_note() + n = unicode(person.get_note()) if n: return n.upper().find(self.list[0].upper()) != -1 return False