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

* src/GenericFilter.py (HasEvent,HasFamilyEvent): Correct filter rules

Browse Source 
svn: r4588
This commit is contained in:
Martin Hawlisch 2005-05-13 20:21:45 +00:00
parent 052bb7f063
commit db2c05cd13
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,3 +1,6 @@
2005-05-13 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/GenericFilter.py (HasEvent,HasFamilyEvent): Correct filter rules
2005-05-13 Alex Roitman <shura@gramps-project.org>
* src/DateDisplay.py (DateDisplayEn): Localize format names.

16
gramps2/src/GenericFilter.py
View File

@ -1076,8 +1076,8 @@ class HasEvent(Rule):
def __init__(self,list):
Rule.__init__(self,list)
if self.list and self.list[0]:
self.date = DateHandler.parser.parse(self.list[0])
if self.list and self.list[1]:
self.date = DateHandler.parser.parse(self.list[1])
else:
self.date = None
@ -1112,8 +1112,8 @@ class HasEvent(Rule):
pn = pl.get_title()
if pn.upper().find(self.list[2].upper()) == -1:
val = 0
if val == 1:
return 1
if val == 1:
return 1
return 0
#-------------------------------------------------------------------------
@ -1129,8 +1129,8 @@ class HasFamilyEvent(Rule):
def __init__(self,list):
Rule.__init__(self,list)
if self.list and self.list[0]:
self.date = DateHandler.parser.parse(self.list[0])
if self.list and self.list[1]:
self.date = DateHandler.parser.parse(self.list[1])
else:
self.date = None
@ -1166,8 +1166,8 @@ class HasFamilyEvent(Rule):
pn = pl.get_title()
if self.list[2] and pn.find(self.list[2].upper()) == -1:
val = 0
if val == 1:
return 1
if val == 1:
return 1
return 0
#-------------------------------------------------------------------------