X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=f7402eeada012aa0682b916d17612c423e90cc2c;hp=8f6a43c609e2fb521c474c06ed4b1ea1248d8889;hb=90393980e5f2859ee1e186fa461f48f5129e803e;hpb=4b7f3cb825c662837c48fd5a24df0b69bfb48e85 diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index 8f6a43c60..f7402eead 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -788,6 +788,10 @@ sub _cdr_date_parse { } elsif ( $date =~ /^\s*(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/ ) { # WIP: 20100329121420 ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); + } elsif ( $date =~ /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z$/) { + # Telos + ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); + $options{gmt} = 1; } else { die "unparsable date: $date"; #maybe we shouldn't die... } @@ -855,6 +859,11 @@ my %import_options = ( keys %cdr_info }, + 'format_xml_formats' => + { map { $_ => $cdr_info{$_}->{'xml_format'}; } + keys %cdr_info + }, + 'format_row_callbacks' => { map { $_ => $cdr_info{$_}->{'row_callback'}; } keys %cdr_info },