[COMMIT LOGREPORT] service/spamfilter/script spamassassin2dlf.in, 1.7, 1.8

[Wytze van der Raay]

Update of /cvsroot/logreport/service/spamfilter/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7846

Modified Files:
	spamassassin2dlf.in 
Log Message:
Generalize patterns for recognizing spamassassin logs, in order to match
multiple variations of spamd logging (spamassassin 2.X and 3.X).


Index: spamassassin2dlf.in
===================================================================
RCS file: /cvsroot/logreport/service/spamfilter/script/spamassassin2dlf.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- spamassassin2dlf.in	24 Aug 2005 14:24:52 -0000	1.7
+++ spamassassin2dlf.in	25 Mar 2008 11:00:04 -0000	1.8
@@ -49,14 +49,14 @@
     my $pid	= $rec->{pid};
     my $line	= $rec->{content};
 
-    if ($line=~/^processing message \<(.+?)\> for (.+?):\d+(, expecting (\d+) bytes)?\. *$/) {
-	$data{$pid}{msgid}	= $1;
-	$data{$pid}{user}	= $2;
-	$data{$pid}{msgsize_in}	= $4 || 0;
+    if ($line=~/(processing|checking) message \<(.+?)\> for (.+?):\d+(, expecting (\d+) bytes)?/) {
+	$data{$pid}{msgid}	= $2;
+	$data{$pid}{user}	= $3;
+	$data{$pid}{msgsize_in}	= $5 || 0;
 	next;
     }
 
-    if ($line=~/^(clean message|identified spam) \((-?[\d.]+)\/[\d.]+\) for .+?:\d+ in +([\d.]+) seconds, (\d+) bytes./) {
+    if ($line=~/(clean message|identified spam) \((-?[\d.]+)\/[\d.]+\) for .+?:\d+ in +([\d.]+) seconds, (\d+) bytes./) {
 	# ignore leftovers from previous logfiles
 	next if (!defined $data{$pid}{msgid});