5268: Filters do not work on exporting XML gramps or generating NAVWEB

svn: r18688
This commit is contained in:
Doug Blank 2012-01-03 04:58:20 +00:00
parent 37ed4e58ca
commit bebc632d22

View File

@ -3,6 +3,7 @@
# #
# Copyright (C) 2002-2006 Donald N. Allingham # Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2011 Tim G L Lyons # Copyright (C) 2011 Tim G L Lyons
# Copyright (C) 2012 Doug Blank <doug.blank@gmail.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -62,10 +63,9 @@ class GenericFilter(object):
return False return False
def is_empty(self): def is_empty(self):
return (len(self.flist) == 0 or return ((len(self.flist) == 0) or
(len(self.flist) == 1 and (len(self.flist) == 1 and ((self.flist[0].is_empty() and
((self.flist[0].is_empty() and not self.invert) or not self.invert))))
(not self.flist[0].is_empty() and self.invert))))
def set_logical_op(self, val): def set_logical_op(self, val):
if val in GenericFilter.logical_functions: if val in GenericFilter.logical_functions: