dbrtools/dbr/dbrfilter.py
branchDBRToolsDev
changeset 283 398d483e91bb
parent 245 fd0a8d235c70
--- a/dbrtools/dbr/dbrfilter.py	Wed Apr 21 22:28:52 2010 +0100
+++ b/dbrtools/dbr/dbrfilter.py	Sun Jun 13 15:29:20 2010 +0100
@@ -151,17 +151,16 @@
       res = dbrresults.DBRResults(set(),set(),set(),set(),set())
       for filter in self.inc:  
         res |= filter.include(results)
-    else:
-      res = results     
-    return res
+        print 'including...'
+      return res
+    return results
     
   def exclude(self, results):
     res = dbrresults.DBRResults(set(),set(),set(),set(),set())
-    if self.exc:
-      res = results
-      for filter in self.exc:
-        res &= filter.exclude(results)
-    return res
+    for filter in self.exc:
+      print 'excluding...'
+      res |= filter.include(results)
+    return results - res
   
   def filter(self, results):
     return self.include(results) & self.exclude(results)