[freeside-commits] freeside/FS/FS/cdr kannel.pm,1.2,1.3

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS/cdr
In directory wavetail.420.am:/tmp/cvs-serv6623/FS/FS/cdr

Modified Files:
	kannel.pm 
Log Message:
cdr/kannel.pm: change row parse format, RT10991

Index: kannel.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr/kannel.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- kannel.pm	22 Jun 2011 20:17:28 -0000	1.2
+++ kannel.pm	22 Jun 2011 21:30:04 -0000	1.3
@@ -14,8 +14,8 @@
   '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' => [