0001938: Substring filter for notes does not work.

svn: r10326

po/POTFILES.in

@@ -633,8 +633,8 @@ src/Filters/Rules/Repository/__init__.py
 src/Filters/Rules/Note/_AllNotes.py
 src/Filters/Rules/Note/_HasIdOf.py
 src/Filters/Rules/Note/_HasMarkerOf.py
-src/Filters/Rules/Note/_HasNoteMatchingSubstringOf.py
+src/Filters/Rules/Note/_MatchesSubstringOf.py
-src/Filters/Rules/Note/_HasNoteRegexp.py
+src/Filters/Rules/Note/_MatchesRegexpOf.py
 src/Filters/Rules/Note/_HasNote.py
 src/Filters/Rules/Note/_HasReferenceCountOf.py
 src/Filters/Rules/Note/_MatchesFilter.py

src/Filters/Rules/Note/Makefile.am

@@ -6,8 +6,8 @@ pkgdata_PYTHON = \
 	_AllNotes.py\
 	_HasIdOf.py\
 	_HasMarkerOf.py\
-	_HasNoteMatchingSubstringOf.py\
+	_MatchesSubstringOf.py\
-	_HasNoteRegexp.py\
+	_MatchesRegexpOf.py\
 	_HasNote.py\
 	_HasReferenceCountOf.py\
 	_MatchesFilter.py\

src/Filters/Rules/Note/_MatchesRegexpOf.py

@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2002-2006  Donald N. Allingham
+# Copyright (C) 2008       Brian G. Matherly
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,13 +19,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id$
+# $Id: _HasNoteRegexp.py 9912 2008-01-22 09:17:46Z acraphae $
 
 #-------------------------------------------------------------------------
 #
 # Standard Python modules
 #
 #-------------------------------------------------------------------------
+import re
 from gettext import gettext as _
 
 #-------------------------------------------------------------------------
@@ -32,14 +34,30 @@ from gettext import gettext as _
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase
+from Filters.Rules import Rule
 
 #-------------------------------------------------------------------------
 # "Repos having notes that contain a substring"
 #-------------------------------------------------------------------------
-class HasNoteRegexp(HasNoteRegexBase):
+class MatchesRegexpOf(Rule):
 
-    name        = _('Notes having notes '
+    labels      = [ _('Regular expression:')]
-                    'containing <regular expression>')
+    name        = _('Notes containing <regular expression>')
-    description = _("Matches notes whose notes contain text "
+    description = _("Matches notes who contain text "
                     "matching a regular expression")
+    category    = _('General filters')
+
+    def __init__(self, list):
+        Rule.__init__(self, list)
+        
+        try:
+            self.match = re.compile(list[0], re.I|re.U|re.L)
+        except:
+            self.match = re.compile('')
+            
+    def apply(self, db, note):
+        """ Apply the filter """
+        text = unicode(note.get())
+        if self.match.match(text) != None:
+            return True
+        return False

src/Filters/Rules/Note/_MatchesSubstringOf.py

@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2002-2006  Donald N. Allingham
+# Copyright (C) 2008       Brian G. Matherly
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,14 +33,23 @@ from gettext import gettext as _
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from Filters.Rules._HasNoteSubstrBase import HasNoteSubstrBase
+from Filters.Rules import Rule
 
 #-------------------------------------------------------------------------
 # "Events having notes that contain a substring"
 #-------------------------------------------------------------------------
-class HasNoteMatchingSubstringOf(HasNoteSubstrBase):
+class MatchesSubstringOf(Rule):
     """Notes having notes containing <subtring>"""
 
-    name        = _('Notes having notes containing <substring>')
+    labels      = [ _('Substring:')]
-    description = _("Matches notes whose notes contain text "
+    name        = _('Notes containing <substring>')
+    description = _("Matches notes who contain text "
                     "matching a substring")
+    category    = _('General filters')
+
+    def apply(self, db, note):
+        """ Apply the filter """
+        text = unicode(note.get())
+        if text.upper().find(self.list[0].upper()) != -1:
+            return True
+        return False

src/Filters/Rules/Note/__init__.py

@@ -29,8 +29,8 @@ from _AllNotes import AllNotes
 from _HasIdOf import HasIdOf
 from _HasMarkerOf import HasMarkerOf
 from _RegExpIdOf import RegExpIdOf
-from _HasNoteRegexp import HasNoteRegexp
+from _MatchesRegexpOf import MatchesRegexpOf
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
+from _MatchesSubstringOf import MatchesSubstringOf
 from _HasReferenceCountOf import HasReferenceCountOf
 from _NotePrivate import NotePrivate
 from _MatchesFilter import MatchesFilter
@@ -42,8 +42,8 @@ editor_rule_list = [
     HasMarkerOf,
     RegExpIdOf,
     HasNote,
-    HasNoteRegexp,
+    MatchesRegexpOf,
-    HasNoteMatchingSubstringOf,
+    MatchesSubstringOf,
     HasReferenceCountOf,
     NotePrivate,
     MatchesFilter,