git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
282b357
)
Improved the '($parent) =' pattern match (Daniel Tiefnig)
author
Steve Campbell
<steve@computurn.com>
Wed, 14 Feb 2007 12:20:43 +0000
(12:20 +0000)
committer
Steve Campbell
<steve@computurn.com>
Wed, 14 Feb 2007 12:20:43 +0000
(12:20 +0000)
src/src/eximstats.src
patch
|
blob
|
history
diff --git
a/src/src/eximstats.src
b/src/src/eximstats.src
index 88eb69fe83b3d849b59d3c965cd5139704340f28..4791c77f588b0712b2c64d2de7f997a6f3d924ce 100644
(file)
--- a/
src/src/eximstats.src
+++ b/
src/src/eximstats.src
@@
-1,5
+1,5
@@
#!PERL_COMMAND -w
#!PERL_COMMAND -w
-# $Cambridge: exim/src/src/eximstats.src,v 1.1
3 2007/01/31 16:52:12 ph10
Exp $
+# $Cambridge: exim/src/src/eximstats.src,v 1.1
4 2007/02/14 12:20:43 steve
Exp $
# Copyright (c) 2001 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.
# 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-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
#
#
# 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;
@days_per_month = (0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
$gig = 1024 * 1024 * 1024;
-$VERSION = '1.5
3
';
+$VERSION = '1.5
4
';
# How much space do we allow for the Hosts/Domains/Emails/Edomains column headers?
$COLUMN_WIDTHS = 8;
# 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)
#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};
$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)
#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};
$user = "$user $parent" if defined $parent;
}
++$delivered_addresses_user{$user};