steve 2007/02/14 12:20:43 GMT
Modified files:
exim-src/src eximstats.src
Log:
Improved the '($parent) =' pattern match (Daniel Tiefnig)
Revision Changes Path
1.14 +8 -3 exim/exim-src/src/eximstats.src
Index: eximstats.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/eximstats.src,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- eximstats.src 31 Jan 2007 16:52:12 -0000 1.13
+++ eximstats.src 14 Feb 2007 12:20:43 -0000 1.14
@@ -1,5 +1,5 @@
#!PERL_COMMAND -w
-# $Cambridge: exim/exim-src/src/eximstats.src,v 1.13 2007/01/31 16:52:12 ph10 Exp $
+# $Cambridge: exim/exim-src/src/eximstats.src,v 1.14 2007/02/14 12:20:43 steve Exp $
# Copyright (c) 2001 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.
@@ -263,6 +263,9 @@
# 2007-01-31 V1.53 Philip Hazel
# Allow for [pid] after date in log lines
#
+# 2007-02-14 V1.54 Daniel Tiefnig
+# Improved the '($parent) =' pattern match.
+#
#
#
# For documentation on the logfile format, see
@@ -561,7 +564,7 @@
@days_per_month = (0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
$gig = 1024 * 1024 * 1024;
-$VERSION = '1.53';
+$VERSION = '1.54';
# How much space do we allow for the Hosts/Domains/Emails/Edomains column headers?
$COLUMN_WIDTHS = 8;
@@ -2076,7 +2079,8 @@
#IFNDEF ($include_original_destination)
if ($user =~ /^[\\/|]/) {
#ENDIF ($include_original_destination)
- my($parent) = $_ =~ /(<[^@]+@?[^>]*>)/;
+ #my($parent) = $_ =~ /(<[^@]+@?[^>]*>)/;
+ my($parent) = $_ =~ / (<.+?>) /; #DT 1.54
$user = "$user $parent" if defined $parent;
}
++$delivered_messages_user{$user};
@@ -2164,7 +2168,8 @@
#IFNDEF ($include_original_destination)
if ($user =~ /^[\\/|]/) {
#ENDIF ($include_original_destination)
- my($parent) = $_ =~ /(<[^@]+@?[^>]*>)/;
+ #my($parent) = $_ =~ /(<[^@]+@?[^>]*>)/;
+ my($parent) = $_ =~ / (<.+?>) /; #DT 1.54
$user = "$user $parent" if defined $parent;
}
++$delivered_addresses_user{$user};
