X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Fbell_west.pm;fp=FS%2FFS%2Fcdr%2Fbell_west.pm;h=4c3899bbf5afa183fc09cb91146a2c18e895eacf;hb=ec2059f7847d99e9218d97df988c8d68c7afcf55;hp=9608513188fbf238055ebc7c3c010bf9cb461f20;hpb=b1a95fab76cca9fd65072b1c4852d8aebcb650ea;p=freeside.git diff --git a/FS/FS/cdr/bell_west.pm b/FS/FS/cdr/bell_west.pm index 960851318..4c3899bbf 100644 --- a/FS/FS/cdr/bell_west.pm +++ b/FS/FS/cdr/bell_west.pm @@ -24,10 +24,16 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker ); # DATE / Yes / "DATE" Excel date format MM/DD/YYYY sub { my($cdr, $date) = @_; - $date =~ /^(\d{1,2})\/(\d{1,2})\/(\d\d(\d\d)?)$/ - or die "unparsable date: $date"; #maybe we shouldn't die... - #$cdr->startdate( timelocal(0, 0, 0 ,$2, $1-1, $3) ); - ($tmp_mday, $tmp_mon, $tmp_year) = ( $2, $1-1, $3 ); + + #$date =~ /^(\d{1,2})\/(\d{1,2})\/(\d\d(\d\d)?)$/ + # or die "unparsable date: $date"; #maybe we shouldn't die... + ##$cdr->startdate( timelocal(0, 0, 0 ,$2, $1-1, $3) ); + #($tmp_mday, $tmp_mon, $tmp_year) = ( $2, $1-1, $3 ); + + my $datetime = DateTime::Format::Excel->parse_datetime( $date ); + $tmp_mon = $datetime->mon_0; + $tmp_mday = $datetime->mday; + $tmp_year = $datetime->year; }, # CUST NO / Yes / "TIME" "075959" Text based time @@ -35,7 +41,7 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker ); # is wrong sub { my($cdr, $time) = @_; #my($sec, $min, $hour, $mday, $mon, $year)= localtime($cdr->startdate); - $time =~ /^(\d{1,2}):(\d{1,2}):(\d{1,2})$/ + $time =~ /^(\d{2})(\d{2})(\d{2})$/ or die "unparsable time: $time"; #maybe we shouldn't die... #$cdr->startdate( timelocal($3, $2, $1 ,$mday, $mon, $year) ); $cdr->startdate(