diff options
| author | Steve Campbell <steve@computurn.com> | 2007-02-14 12:20:43 +0000 |
|---|---|---|
| committer | Steve Campbell <steve@computurn.com> | 2007-02-14 12:20:43 +0000 |
| commit | a797be693868f54f94956ad44d2d1cdeb4712ee9 (patch) | |
| tree | 0bfa81dc8e10a7941c8517bd5af933d78ddbb0c0 /src | |
| parent | 282b357d3a6f6ac8d8bdc3253923f78046414baa (diff) | |
Improved the '($parent) =' pattern match (Daniel Tiefnig)
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/eximstats.src | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/src/eximstats.src b/src/src/eximstats.src index 88eb69fe8..4791c77f5 100644 --- a/src/src/eximstats.src +++ b/src/src/eximstats.src @@ -1,5 +1,5 @@ #!PERL_COMMAND -w -# $Cambridge: exim/src/src/eximstats.src,v 1.13 2007/01/31 16:52:12 ph10 Exp $ +# $Cambridge: 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 @@ use vars qw($WEEK $DAY $HOUR $MINUTE); @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 @@ sub generate_parser { #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 @@ sub generate_parser { #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}; |