149 def include(self, results): |
149 def include(self, results): |
150 if self.inc: |
150 if self.inc: |
151 res = dbrresults.DBRResults(set(),set(),set(),set(),set()) |
151 res = dbrresults.DBRResults(set(),set(),set(),set(),set()) |
152 for filter in self.inc: |
152 for filter in self.inc: |
153 res |= filter.include(results) |
153 res |= filter.include(results) |
154 else: |
154 print 'including...' |
155 res = results |
155 return res |
156 return res |
156 return results |
157 |
157 |
158 def exclude(self, results): |
158 def exclude(self, results): |
159 res = dbrresults.DBRResults(set(),set(),set(),set(),set()) |
159 res = dbrresults.DBRResults(set(),set(),set(),set(),set()) |
160 if self.exc: |
160 for filter in self.exc: |
161 res = results |
161 print 'excluding...' |
162 for filter in self.exc: |
162 res |= filter.include(results) |
163 res &= filter.exclude(results) |
163 return results - res |
164 return res |
|
165 |
164 |
166 def filter(self, results): |
165 def filter(self, results): |
167 return self.include(results) & self.exclude(results) |
166 return self.include(results) & self.exclude(results) |
168 |
167 |
169 |
168 |