From e82252995931c729ffb1e6ac0456e20955434bc6 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 30 Nov 2006 20:30:28 +0000 Subject: [PATCH] * src/Filters/Rules/Repository/_HasRepo.py: Correct logic. svn: r7737 --- gramps2/ChangeLog | 1 + .../src/Filters/Rules/Repository/_HasRepo.py | 35 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index d1e6c3d32..44413b679 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,5 @@ 2006-11-30 Alex Roitman + * src/Filters/Rules/Repository/_HasRepo.py: Correct logic. * src/Filters/Rules/Makefile.am: Ship new file. * src/Filters/Rules/Family/Makefile.am: Ship new file. * src/Filters/Rules/Person/Makefile.am: Ship new file. diff --git a/gramps2/src/Filters/Rules/Repository/_HasRepo.py b/gramps2/src/Filters/Rules/Repository/_HasRepo.py index 8bc9537dd..e40a3f8a9 100644 --- a/gramps2/src/Filters/Rules/Repository/_HasRepo.py +++ b/gramps2/src/Filters/Rules/Repository/_HasRepo.py @@ -63,21 +63,26 @@ class HasRepo(Rule): if repo.type != specified_type: return False - addr_match = False - for addr in repo.address_list: - addr_text = addr.city + addr.state + addr.country + addr.postal \ - + addr.phone + addr.street + if self.list[2]: + addr_match = False + for addr in repo.address_list: + addr_text = addr.city + addr.state + addr.country \ + + addr.postal + addr.phone + addr.street - if not self.match_substring(2,addr_text): - continue + if self.match_substring(2,addr_text): + addr_match = True + break + if not addr_match: + return False - addr_match = True + if self.list[3]: + url_match = False + for url in repo.urls: + url_text = url.path + url.desc + if self.match_substring(3,url_text): + url_match = True + break + if not url_match: + return False - url_match = False - for url in repo.urls: - url_text = url.path + url.desc - if not self.match_substring(3,url_text): - continue - url_match = True - - return (addr_match or url_match) + return True