X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=723123a76d12d081a183069127a50f554bbe6552;hb=be5a76006fb0d317c667c0432737284146b2ae45;hp=20c3dbc9365b61edd3389bad8820f2ea7aa6dc97;hpb=9408d3552cb808c1df667fca852b130f5cdd4b4c;p=freeside.git diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index 20c3dbc93..723123a76 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -8,6 +8,7 @@ use Date::Parse; use Date::Format; use Time::Local; use FS::UID qw( dbh ); +use FS::Conf; use FS::Record qw( qsearch qsearchs ); use FS::cdr_type; use FS::cdr_calltype; @@ -129,6 +130,8 @@ following fields are currently supported: =item freesidestatus - NULL, done (or something) +=item freesiderewritestatus - NULL, done (or something) + =item cdrbatch =back @@ -150,6 +153,54 @@ points to. You can ask the object for a copy with the I method. sub table { 'cdr'; } +sub table_info { + { + 'fields' => { +#XXX fill in some (more) nice names + #'acctid' => '', + 'calldate' => 'Call date', + 'clid' => 'Caller ID', + 'src' => 'Source', + 'dst' => 'Destination', + 'dcontext' => 'Dest. context', + 'channel' => 'Channel', + 'dstchannel' => 'Destination channel', + #'lastapp' => '', + #'lastdata' => '', + 'startdate' => 'Start date', + 'answerdate' => 'Answer date', + 'enddate' => 'End date', + 'duration' => 'Duration', + 'billsec' => 'Billable seconds', + 'disposition' => 'Disposition', + 'amaflags' => 'AMA flags', + 'accountcode' => 'Account code', + #'uniqueid' => '', + 'userfield' => 'User field', + #'cdrtypenum' => '', + 'charged_party' => 'Charged party', + #'upstream_currency' => '', + 'upstream_price' => 'Upstream price', + #'upstream_rateplanid' => '', + #'ratedetailnum' => '', + 'rated_price' => 'Rated price', + #'distance' => '', + #'islocal' => '', + #'calltypenum' => '', + #'description' => '', + #'quantity' => '', + 'carrierid' => 'Carrier ID', + #'upstream_rateid' => '', + 'svcnum' => 'Freeside service', + 'freesidestatus' => 'Freeside status', + 'freesiderewritestatus' => 'Freeside rewrite status', + 'cdrbatch' => 'Batch', + }, + + }; + +} + =item insert Adds this record to the database. If there is an error, returns the error, @@ -227,19 +278,23 @@ sub check { # || $self->ut_numbern('upstream_rateid') # || $self->ut_numbern('svcnum') # || $self->ut_textn('freesidestatus') +# || $self->ut_textn('freesiderewritestatus') # ; # return $error if $error; $self->calldate( $self->startdate_sql ) if !$self->calldate && $self->startdate; - unless ( $self->charged_party ) { - if ( $self->dst =~ /^(\+?1)?8[02-8]{2}/ ) { - $self->charged_party($self->dst); - } else { - $self->charged_party($self->src); - } + #was just for $format eq 'taqua' but can't see the harm... add something to + #disable if it becomes a problem + if ( $self->duration eq '' && $self->enddate && $self->startdate ) { + $self->duration( $self->enddate - $self->startdate ); } + if ( $self->billsec eq '' && $self->enddate && $self->answerdate ) { + $self->billsec( $self->enddate - $self->answerdate ); + } + + $self->set_charged_party; #check the foreign keys even? #do we want to outright *reject* the CDR? @@ -262,6 +317,62 @@ sub check { $self->SUPER::check; } +=item is_tollfree + + Returns true when the cdr represents a toll free number and false otherwise. + +=cut + +sub is_tollfree { + my $self = shift; + ( $self->dst =~ /^(\+?1)?8(8|([02-7])\3)/ ) ? 1 : 0; +} + +=item set_charged_party + +If the charged_party field is already set, does nothing. Otherwise: + +If the cdr-charged_party-accountcode config option is enabled, sets the +charged_party to the accountcode. + +Otherwise sets the charged_party normally: to the src field in most cases, +or to the dst field if it is a toll free number. + +=cut + +sub set_charged_party { + my $self = shift; + + my $conf = new FS::Conf; + + unless ( $self->charged_party ) { + + if ( $conf->exists('cdr-charged_party-accountcode') && $self->accountcode ){ + + $self->charged_party( $self->accountcode ); + + } else { + + if ( $self->is_tollfree ) { + $self->charged_party($self->dst); + } else { + $self->charged_party($self->src); + } + + } + + } + +# my $prefix = $conf->config('cdr-charged_party-truncate_prefix'); +# my $prefix_len = length($prefix); +# my $trunc_len = $conf->config('cdr-charged_party-truncate_length'); +# +# $self->charged_party( substr($self->charged_party, 0, $trunc_len) ) +# if $prefix_len && $trunc_len +# && substr($self->charged_party, 0, $prefix_len) eq $prefix; + +} + =item set_status_and_rated_price STATUS [ RATED_PRICE ] Sets the status to the provided string. If there is an error, returns the @@ -403,17 +514,38 @@ sub _convergent_format { my %export_names = ( 'convergent' => {}, - 'simple' => { 'name' => 'Simple', - 'invoice_header' => - "Date,Time,Name,Destination,Duration,Price", - }, - 'simple2' => { 'name' => 'Simple with source', - 'invoice_header' => - #"Date,Time,Name,Called From,Destination,Duration,Price", - "Date,Time,Called From,Destination,Duration,Price", - }, + 'simple' => { + 'name' => 'Simple', + 'invoice_header' => "Date,Time,Name,Destination,Duration,Price", + }, + 'simple2' => { + 'name' => 'Simple with source', + 'invoice_header' => "Date,Time,Called From,Destination,Duration,Price", + #"Date,Time,Name,Called From,Destination,Duration,Price", + }, + 'default' => { + 'name' => 'Default', + 'invoice_header' => 'Date,Time,Number,Destination,Duration,Price', + }, + 'source_default' => { + 'name' => 'Default with source', + 'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price', + }, + 'accountcode_default' => { + 'name' => 'Default plus accountcode', + 'invoice_header' => 'Date,Time,Account,Number,Destination,Duration,Price', + }, ); +my $duration_sub = sub { + my($cdr, %opt) = @_; + if ( $opt{minutes} ) { + $opt{minutes}. ( $opt{granularity} ? 'm' : ' call' ); + } else { + sprintf('%.2fm', $cdr->billsec / 60 ); + } +}; + my %export_formats = ( 'convergent' => [ 'carriername', #CARRIER @@ -435,19 +567,50 @@ my %export_formats = ( sub { time2str('%r', shift->calldate_unix ) }, #TIME 'userfield', #USER 'dst', #NUMBER_DIALED - sub { sprintf('%.2fm', shift->billsec / 60 ) }, #DURATION - sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE + $duration_sub, #DURATION + #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE + sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE ], 'simple2' => [ sub { time2str('%D', shift->calldate_unix ) }, #DATE sub { time2str('%r', shift->calldate_unix ) }, #TIME #'userfield', #USER - 'dst', #NUMBER_DIALED 'src', #called from - sub { sprintf('%.2fm', shift->billsec / 60 ) }, #DURATION - sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE + 'dst', #NUMBER_DIALED + $duration_sub, #DURATION + #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE + sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE + ], + 'default' => [ + + #DATE + sub { time2str('%D', shift->calldate_unix ) }, + # #time2str("%Y %b %d - %r", $cdr->calldate_unix ), + + #TIME + sub { time2str('%r', shift->calldate_unix ) }, + # time2str("%c", $cdr->calldate_unix), #XXX this should probably be a config option dropdown so they can select US vs- rest of world dates or whatnot + + #DEST ("Number") + sub { my($cdr, %opt) = @_; $opt{pretty_dst} || $cdr->dst; }, + + #REGIONNAME ("Destination") + sub { my($cdr, %opt) = @_; $opt{dst_regionname}; }, + + #DURATION + $duration_sub, + + #PRICE + sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, + ], ); +$export_formats{'source_default'} = [ 'src', @{ $export_formats{'default'} }, ]; +$export_formats{'accountcode_default'} = + [ @{ $export_formats{'default'} }[0,1], + 'accountcode', + @{ $export_formats{'default'} }[2..5], + ]; sub downstream_csv { my( $self, %opt ) = @_; @@ -455,13 +618,17 @@ sub downstream_csv { my $format = $opt{'format'}; # 'convergent'; return "Unknown format $format" unless exists $export_formats{$format}; + #my $conf = new FS::Conf; + #$opt{'money_char'} ||= $conf->config('money_char') || '$'; + $opt{'money_char'} ||= FS::Conf->new->config('money_char') || '$'; + eval "use Text::CSV_XS;"; die $@ if $@; my $csv = new Text::CSV_XS; my @columns = map { - ref($_) ? &{$_}($self) : $self->$_(); + ref($_) ? &{$_}($self, %opt) : $self->$_(); } @{ $export_formats{$format} }; @@ -570,25 +737,34 @@ sub _cdr_min_parse { sub _cdr_date_parser_maker { my $field = shift; + my %options = @_; + my @fields = ref($field) ? @$field : ($field); return sub { - my( $cdr, $date ) = @_; - #$cdr->$field( _cdr_date_parse($date) ); - eval { $cdr->$field( _cdr_date_parse($date) ); }; - die "error parsing date for $field from $date: $@\n" if $@; + my( $cdr, $datestring ) = @_; + my $unixdate = eval { _cdr_date_parse($datestring, %options) }; + die "error parsing date for @fields from $datestring: $@\n" if $@; + $cdr->$_($unixdate) foreach @fields; }; } sub _cdr_date_parse { my $date = shift; + my %options = @_; return '' unless length($date); #that's okay, it becomes NULL + return '' if $date eq 'NA'; #sansay + + if ( $date =~ /^([a-z]{3})\s+([a-z]{3})\s+(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})\s+(\d{4})$/i && $7 > 1970 ) { + my $time = str2time($date); + return $time if $time > 100000; #just in case + } my($year, $mon, $day, $hour, $min, $sec); #$date =~ /^\s*(\d{4})[\-\/]\(\d{1,2})[\-\/](\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})\s*$/ #taqua #2007-10-31 08:57:24.113000000 - if ( $date =~ /^\s*(\d{4})\D(\d{1,2})\D(\d{1,2})\s+(\d{1,2})\D(\d{1,2})\D(\d{1,2})(\D|$)/ ) { + if ( $date =~ /^\s*(\d{4})\D(\d{1,2})\D(\d{1,2})\D+(\d{1,2})\D(\d{1,2})\D(\d{1,2})(\D|$)/ ) { ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); } elsif ( $date =~ /^\s*(\d{1,2})\D(\d{1,2})\D(\d{4})\s+(\d{1,2})\D(\d{1,2})\D(\d{1,2})(\D|$)/ ) { ($mon, $day, $year, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); @@ -596,10 +772,14 @@ sub _cdr_date_parse { die "unparsable date: $date"; #maybe we shouldn't die... } - return '' if $year == 1900 && $mon == 1 && $day == 1 - && $hour == 0 && $min == 0 && $sec == 0; + return '' if ( $year == 1900 || $year == 1970 ) && $mon == 1 && $day == 1 + && $hour == 0 && $min == 0 && $sec == 0; - timelocal($sec, $min, $hour, $day, $mon-1, $year); + if ($options{gmt}) { + timegm($sec, $min, $hour, $day, $mon-1, $year); + } else { + timelocal($sec, $min, $hour, $day, $mon-1, $year); + } } =item batch_import HASHREF @@ -608,146 +788,80 @@ Imports CDR records. Available options are: =over 4 -=item filehandle +=item file -=item format +Filename -=back - -=cut - -sub batch_import { - my $param = shift; - - my $fh = $param->{filehandle}; - my $format = $param->{format}; - my $cdrbatch = $param->{cdrbatch}; - - return "Unknown format $format" - unless exists( $cdr_info{$format} ) - && exists( $cdr_info{$format}->{'import_fields'} ); - - my $info = $cdr_info{$format}; - - my $type = exists($info->{'type'}) ? lc($info->{'type'}) : 'csv'; - - my $parser; - if ( $type eq 'csv' ) { - eval "use Text::CSV_XS;"; - die $@ if $@; - my %attr = (); - foreach ( grep exists($info->{$_}), qw( sep_char ) ) { - $attr{$_} = $info->{$_}; - } - $parser = new Text::CSV_XS \%attr; - } elsif ( $type eq 'fixedlength' ) { - eval "use Parse::FixedLength;"; - die $@ if $@; - $parser = new Parse::FixedLength $info->{'fixedlength_format'}; - } else { - die "Unknown CDR format type $type for format $format\n"; - } - - my $imported = 0; - #my $columns; - - local $SIG{HUP} = 'IGNORE'; - local $SIG{INT} = 'IGNORE'; - local $SIG{QUIT} = 'IGNORE'; - local $SIG{TERM} = 'IGNORE'; - local $SIG{TSTP} = 'IGNORE'; - local $SIG{PIPE} = 'IGNORE'; - - my $oldAutoCommit = $FS::UID::AutoCommit; - local $FS::UID::AutoCommit = 0; - my $dbh = dbh; - - my $header_lines = exists($info->{'header'}) ? $info->{'header'} : 0; +=item format - my $line; - while ( defined($line=<$fh>) ) { +=item params - next if $header_lines-- > 0; #&& $line =~ /^[\w, "]+$/ +Hash reference of preset fields, typically cdrbatch - my @columns = (); - if ( $type eq 'csv' ) { +=item empty_ok - $parser->parse($line) or do { - $dbh->rollback if $oldAutoCommit; - return "can't parse: ". $parser->error_input(); - }; +Set true to prevent throwing an error on empty imports - @columns = $parser->fields(); +=back - } elsif ( $type eq 'fixedlength' ) { +=cut - @columns = $parser->parse($line); +my %import_options = ( + 'table' => 'cdr', - } else { - die "Unknown CDR format type $type for format $format\n"; - } + 'formats' => { map { $_ => $cdr_info{$_}->{'import_fields'}; } + keys %cdr_info + }, - #warn join('-',@columns); + #drop the || 'csv' to allow auto xls for csv types? + 'format_types' => { map { $_ => ( lc($cdr_info{$_}->{'type'}) || 'csv' ); } + keys %cdr_info + }, - if ( $format eq 'simple' ) { #should be a callback or opt in FS::cdr::simple - @columns = map { s/^ +//; $_; } @columns; - } + 'format_headers' => { map { $_ => ( $cdr_info{$_}->{'header'} || 0 ); } + keys %cdr_info + }, - my @later = (); - my %cdr = - map { + 'format_sep_chars' => { map { $_ => $cdr_info{$_}->{'sep_char'}; } + keys %cdr_info + }, - my $field_or_sub = $_; - if ( ref($field_or_sub) ) { - push @later, $field_or_sub, shift(@columns); - (); - } else { - ( $field_or_sub => shift @columns ); - } + 'format_fixedlength_formats' => + { map { $_ => $cdr_info{$_}->{'fixedlength_format'}; } + keys %cdr_info + }, +); - } - @{ $info->{'import_fields'} } - ; - - $cdr{cdrbatch} = $cdrbatch; +sub _import_options { + \%import_options; +} - my $cdr = new FS::cdr ( \%cdr ); +sub batch_import { + my $opt = shift; - while ( scalar(@later) ) { - my $sub = shift @later; - my $data = shift @later; - &{$sub}($cdr, $data); # $cdr->&{$sub}($data); - } + my $iopt = _import_options; + $opt->{$_} = $iopt->{$_} foreach keys %$iopt; - if ( $format eq 'taqua' ) { #should be a callback or opt in FS::cdr::taqua - if ( $cdr->enddate && $cdr->startdate ) { #a bit more? - $cdr->duration( $cdr->enddate - $cdr->startdate ); - } - if ( $cdr->enddate && $cdr->answerdate ) { #a bit more? - $cdr->billsec( $cdr->enddate - $cdr->answerdate ); - } - } + FS::Record::batch_import( $opt ); - my $error = $cdr->insert; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; +} - #or just skip? - #next; - } +=item process_batch_import - $imported++; - } +=cut - $dbh->commit or die $dbh->errstr if $oldAutoCommit; +sub process_batch_import { + my $job = shift; - #might want to disable this if we skip records for any reason... - return "Empty file!" unless $imported || $param->{empty_ok}; + my $opt = _import_options; + $opt->{'params'} = [ 'format', 'cdrbatch' ]; - ''; + FS::Record::process_batch_import( $job, $opt, @_ ); } +# if ( $format eq 'simple' ) { #should be a callback or opt in FS::cdr::simple +# @columns = map { s/^ +//; $_; } @columns; +# } =back