From: levinse <levinse>
Date: Wed, 22 Jun 2011 21:30:04 +0000 (+0000)
Subject: cdr/kannel.pm: change row parse format, RT10991
X-Git-Tag: freeside_2_3_0~82
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=7e1d7a10dd124acbf5bad285fad8296700fc4bd1

cdr/kannel.pm: change row parse format, RT10991
---

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' => [