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

diff --git a/FS/FS/cdr/kannel.pm b/FS/FS/cdr/kannel.pm
index 60802ab..e9267c1 100644 (file)
--- a/FS/FS/cdr/kannel.pm
+++ b/FS/FS/cdr/kannel.pm
@@ -14,16 +14,30 @@ 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:(\s|)(|\+)(\d+)\] \[to:(|\+)(\d+)\] (\[flags:.*?\]) \[msg:(\d+):(.*?)\] (\[udh:.*?\])$/;
-                        $row = "$1,$2,$3,$6,$8,$9,$10,$12";
+                            $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:(.*?)\] \[to:(.*?)\] (\[flags:.*?\]) \[msg:(\d+):.*?\] (\[udh:.*?\])$/;
+                        $row = "$1,$2,$3,$4,$5,$6,$7,$8";
                         $row;
                      },
   'import_fields' => [
         _cdr_date_parser_maker('startdate'),
         'disposition',
         'userfield', # [SMSC: ... FID...], five fields
-        'src',
-        'dst',
+
+        sub {
+            my($cdr, $src) = @_;
+            $src =~ s/[^\+\d]//g; 
+            $src =~ /^(\+|)(\d+)$/ 
+                or die "unparsable number: $src"; #maybe we shouldn't die...
+            $cdr->src("$1$2");
+        },
+        
+        sub {
+            my($cdr, $dst) = @_;
+            $dst =~ s/[^\+\d]//g; 
+            $dst =~ /^(\+|)(\d+)$/ 
+                or die "unparsable number: $dst"; #maybe we shouldn't die...
+            $cdr->dst("$1$2");
+        },
 
         sub { my($cdr, $flags) = @_;
             $cdr->userfield($cdr->userfield." $flags");