From d58eb0204226b9b6a3565b88a64379452a36e6c7 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 28 Aug 2006 17:56:42 +0000 Subject: [PATCH] 2006-08-28 Alex Roitman * src/RelLib/_Address.py (get_text_data_list): Typo. * src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py (apply): Stop adding birth and death events. * configure.in: Increment version number. * RELEASE: version 2.1.95 is released. svn: r7283 --- gramps2/ChangeLog | 7 +++++++ gramps2/configure.in | 2 +- .../Filters/Rules/Person/_HasTextMatchingSubstringOf.py | 2 +- gramps2/src/RelLib/_Address.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 95b6c6b14..862dc66f9 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,10 @@ +2006-08-28 Alex Roitman + * src/RelLib/_Address.py (get_text_data_list): Typo. + * src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py (apply): + Stop adding birth and death events. + * configure.in: Increment version number. + * RELEASE: version 2.1.95 is released. + 2006-08-27 Don Allingham * src/GrampsDb/_ReadGedcom.py: fix parsing index to correctly identify levels for a RESI tag diff --git a/gramps2/configure.in b/gramps2/configure.in index 950826ec9..f30fde928 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_PREREQ(2.57) -AC_INIT(gramps, 2.1.95, [gramps-bugs@lists.sourceforge.net]) +AC_INIT(gramps, 2.1.98, [gramps-bugs@lists.sourceforge.net]) AC_CONFIG_SRCDIR(configure.in) AM_INIT_AUTOMAKE(1.6.3) diff --git a/gramps2/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py b/gramps2/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py index b242b81e1..b5798dc02 100644 --- a/gramps2/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py +++ b/gramps2/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py @@ -89,7 +89,7 @@ class HasTextMatchingSubstringOf(Rule): return self.person_map[person.handle] if self.match_object(person): # first match the person itself return True - for event_ref in person.get_event_ref_list()+[person.get_birth_ref(), person.get_death_ref()]: + for event_ref in person.get_event_ref_list(): if self.search_event(event_ref.ref): # match referenced events return True for family_handle in person.get_family_handle_list(): # match families diff --git a/gramps2/src/RelLib/_Address.py b/gramps2/src/RelLib/_Address.py index 97d864b59..d3f1d0547 100644 --- a/gramps2/src/RelLib/_Address.py +++ b/gramps2/src/RelLib/_Address.py @@ -84,7 +84,7 @@ class Address(SecondaryObject,PrivacyBase,SourceBase,NoteBase,DateBase, @return: Returns the list of all textual attributes of the object. @rtype: list """ - return [self.street] + LocationBase.get_text_data_list() + return [self.street] + LocationBase.get_text_data_list(self) #return [self.street,self.city,self.state,self.country, # self.postal,self.phone,self.get_date()]