summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevinse <levinse>2011-06-22 21:30:04 +0000
committerlevinse <levinse>2011-06-22 21:30:04 +0000
commit7e1d7a10dd124acbf5bad285fad8296700fc4bd1 (patch)
treea38e10014aea4c70eff458b210363a3f61f35910
parent9e281e06c75a470c01ec3b8e4dcbdbb5f99a4b61 (diff)
cdr/kannel.pm: change row parse format, RT10991
-rw-r--r--FS/FS/cdr/kannel.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/cdr/kannel.pm b/FS/FS/cdr/kannel.pm
index 2f54ebe72..60802ab7b 100644
--- a/FS/FS/cdr/kannel.pm
+++ b/FS/FS/cdr/kannel.pm
@@ -14,8 +14,8 @@ use FS::cdr qw( _cdr_date_parser_maker );
'row_callback' => sub { my $row = shift;
return ' ' if $row =~ /.*Log (begins|ends)$/;
die "invalid row format for '$row'" unless
- $row =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) ([A-Za-z ]+) (\[SMSC:\w+\] \[SVC:\w*\] \[ACT:\w*\] \[BINF:\w*\] \[FID:\w*\]) \[from:(|\+)(\d+)\] \[to:(|\+)(\d+)\] (\[flags:.*?\]) \[msg:(\d+):(.*?)\] (\[udh:.*?\])$/;
- $row = "$1,$2,$3,$5,$7,$8,$9,$11";
+ $row =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) ([A-Za-z ]+) (\[SMSC:\w+\] \[SVC:\w*\] \[ACT:\w*\] \[BINF:\w*\] \[FID:\w*\]) \[from:(\s|)(|\+)(\d+)\] \[to:(|\+)(\d+)\] (\[flags:.*?\]) \[msg:(\d+):(.*?)\] (\[udh:.*?\])$/;
+ $row = "$1,$2,$3,$6,$8,$9,$10,$12";
$row;
},
'import_fields' => [