CVS: tmda/bin tmda-rfilter,1.99,1.100 tmda-inject,1.89,1.90

Update of /cvsroot/tmda/tmda/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv21143/bin

Modified Files:
	tmda-rfilter tmda-inject 
Log Message:
Added support for from-sql/to-sql rules.  These rules use Python DB
API 2.0 modules to support various databases with the same code.

Also, fixed two regular expressions in FilterParser that were too
"greedy".  The old behavior made it impossible to have two custom
headers with quoted values.  The text between the first quote of the
first header and the last quote of the last header was concatenated
into one string.


Index: tmda-rfilter
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-rfilter,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- tmda-rfilter	18 Jun 2003 17:20:43 -0000	1.99
+++ tmda-rfilter	1 Jul 2003 06:29:51 -0000	1.100
@@ -780,7 +780,7 @@
     if (cookie_type in Defaults.TAGS_CONFIRM) and cookie_value:
         verify_confirm_cookie(cookie_value, 'accept')
     # Parse the incoming filter file.
-    infilter = FilterParser.FilterParser()
+    infilter = FilterParser.FilterParser(Defaults.DB_CONNECTION)
     infilter.read(Defaults.FILTER_INCOMING)
     (actions, matching_line) = infilter.firstmatch(recipient_address,
                                                    sender_list,

Index: tmda-inject
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-inject,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- tmda-inject	29 May 2003 18:25:41 -0000	1.89
+++ tmda-inject	1 Jul 2003 06:29:51 -0000	1.90
@@ -408,7 +408,7 @@
             pass                        
         else:
             # Without `X-TMDA', we need to parse the outgoing filter file.
-            outfilter = FilterParser.FilterParser()
+            outfilter = FilterParser.FilterParser(Defaults.DB_CONNECTION)
             outfilter.read(Defaults.FILTER_OUTGOING)
             (actions, matching_line) = outfilter.firstmatch(address,
                                                             [from_address])

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs