From db2c05cd13bcc478e525822ad520d34023830ee7 Mon Sep 17 00:00:00 2001 From: Martin Hawlisch Date: Fri, 13 May 2005 20:21:45 +0000 Subject: [PATCH] * src/GenericFilter.py (HasEvent,HasFamilyEvent): Correct filter rules svn: r4588 --- gramps2/ChangeLog | 3 +++ gramps2/src/GenericFilter.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index e123b0f8e..66b0a3ebd 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2005-05-13 Martin Hawlisch + * src/GenericFilter.py (HasEvent,HasFamilyEvent): Correct filter rules + 2005-05-13 Alex Roitman * src/DateDisplay.py (DateDisplayEn): Localize format names. diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index 3833e53e7..de45d3ee6 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -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 #-------------------------------------------------------------------------