From c4d894920b529f19c64e4ea42a9fd45af7951542 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 9 Dec 2005 04:14:24 +0000 Subject: [PATCH] * src/Merge.py: fix date comparison svn: r5515 --- gramps2/ChangeLog | 1 + gramps2/src/plugins/Merge.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 2c87fca09..4661f7b3c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,5 @@ 2005-12-08 Don Allingham + * src/Merge.py: fix date comparison * src/Utils.py: add xml:lang generation function * src/docgen/AbiWord2Doc.py: set locale * src/docgen/OpenOfficeDoc: set locale using xml_lang() diff --git a/gramps2/src/plugins/Merge.py b/gramps2/src/plugins/Merge.py index 0dc391239..f8e8d2f30 100644 --- a/gramps2/src/plugins/Merge.py +++ b/gramps2/src/plugins/Merge.py @@ -374,7 +374,7 @@ class Merge(Tool.Tool): return s1 == s2 def date_match(self,date1,date2): - if date1.is_empty() == "" or date2.is_empty() == "": + if date1.is_empty() or date2.is_empty(): return 0 if date1.is_equal(date2): return 1 @@ -514,7 +514,7 @@ class Merge(Tool.Tool): else: death2 = RelLib.Event() - value = self.date_match(birth1.get_date_object(),birth2.get_date_object()) + value = self.date_match(birth1.get_date_object(),birth2.get_date_object()) if value == -1 : return -1 chance = chance + value