--- a/dbrtools/dbr/diffenv.py	Wed Mar 24 16:43:43 2010 +0000
+++ b/dbrtools/dbr/diffenv.py	Mon Apr 19 22:50:19 2010 +0100
@@ -14,22 +14,20 @@
 # new diffenv - uses OO interface and can have 
 
 import dbrenv
+import dbrfilter
 
 def run(args):
     if(len(args)):
-      filtertype = ''
       if(len(args) == 1):
         first = '/'
-        second = args[0]
+        second = args.pop(0)        
       else:
-        first = args[0]
-        second = args[1]
-      if(len(args) == 3):
-        filtertype = args[2]    
+        first = args.pop(0)
+        second = args.pop(0)
+      filter = dbrfilter.CreateFilter(args)
       db1=dbrenv.CreateDB(first)
       db2=dbrenv.CreateDB(second)
       results = db1.compare(db2)
-      filter = dbrenv.CreateFilter(filtertype)
       filteredresults = filter.filter(results)
       filteredresults.printdetail()
       filteredresults.printsummary()