From: Jeremy Davis Date: Wed, 8 Apr 2015 14:52:50 +0000 (-0400) Subject: ISPPhone CDR format X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=f65ac2eaef54f51964c0ee1d626d434b32c406cc ISPPhone CDR format --- diff --git a/FS/FS/cdr/ispphone.pm b/FS/FS/cdr/ispphone.pm index 49d1b07f4..2817d53c1 100644 --- a/FS/FS/cdr/ispphone.pm +++ b/FS/FS/cdr/ispphone.pm @@ -3,7 +3,7 @@ package FS::cdr::ispphone; use strict; use vars qw( @ISA %info $tmp_mon $tmp_mday $tmp_year ); use Time::Local; -use FS::cdr; +use FS::cdr qw ( _cdr_date_parser_maker ); use Date::Parse; @ISA = qw(FS::cdr); @@ -11,29 +11,15 @@ use Date::Parse; %info = ( 'name' => 'ISPPhone', 'weight' => 123, - 'header' => 2, + 'header' => 1, 'import_fields' => [ + 'accountcode', # Accountcode 'src', # Form 'dst', # To - 'upstream_dst_regionname', # Country - 'dcontext', # Description - - sub { my ($cdr, $calldate) = @_; - $cdr->set('calldate', $calldate); - - my $tmp_date; - - if ($calldate =~ /^(\d{2})\/(\d{2})\/(\d{2})\s*(\d{1,2}):(\d{2})$/){ - - $tmp_date = "$2/$1/$3 $4:$5:$6"; - - } else { $tmp_date = $calldate; } - - $tmp_date = str2time($tmp_date); - $cdr->set('startdate', $tmp_date); - - }, #DateTime + skip(1), # Country + 'upstream_dst_regionname', # Description +_cdr_date_parser_maker('startdate'), #DateTime sub { my ($cdr, $duration) = @_; my ($min,$sec) = split(/:/, $duration); @@ -47,5 +33,7 @@ use Date::Parse; ); +sub skip { map {''} (1..$_[0]) } + 1;