2006-08-28 Alex Roitman <shura@gramps-project.org>

* 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
This commit is contained in:
Alex Roitman 2006-08-28 17:56:42 +00:00
parent 9d89a23921
commit d58eb02042
4 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2006-08-28 Alex Roitman <shura@gramps-project.org>
* 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 <don@gramps-project.org> 2006-08-27 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: fix parsing index to correctly * src/GrampsDb/_ReadGedcom.py: fix parsing index to correctly
identify levels for a RESI tag identify levels for a RESI tag

View File

@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl May need to run automake && aclocal first dnl May need to run automake && aclocal first
AC_PREREQ(2.57) 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) AC_CONFIG_SRCDIR(configure.in)
AM_INIT_AUTOMAKE(1.6.3) AM_INIT_AUTOMAKE(1.6.3)

View File

@ -89,7 +89,7 @@ class HasTextMatchingSubstringOf(Rule):
return self.person_map[person.handle] return self.person_map[person.handle]
if self.match_object(person): # first match the person itself if self.match_object(person): # first match the person itself
return True 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 if self.search_event(event_ref.ref): # match referenced events
return True return True
for family_handle in person.get_family_handle_list(): # match families for family_handle in person.get_family_handle_list(): # match families

View File

@ -84,7 +84,7 @@ class Address(SecondaryObject,PrivacyBase,SourceBase,NoteBase,DateBase,
@return: Returns the list of all textual attributes of the object. @return: Returns the list of all textual attributes of the object.
@rtype: list @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, #return [self.street,self.city,self.state,self.country,
# self.postal,self.phone,self.get_date()] # self.postal,self.phone,self.get_date()]