X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=ff07a59ee11d7af1595adae0c6c7e9cb875a55ba;hb=e81fcc3454632f6a60173a139cb6be268658c4ea;hp=e8be0805669b38cb2dc93076cb5c1608409c6bf4;hpb=0998ca2d30dcd94bc1ea5db8e689ff30e7658baa;p=freeside.git diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index e8be08056..ff07a59ee 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -1,12 +1,16 @@ package FS::cdr; use strict; -use vars qw( @ISA @EXPORT_OK $DEBUG $me ); +use vars qw( @ISA @EXPORT_OK $DEBUG $me + $conf $cdr_prerate %cdr_prerate_cdrtypenums + ); use Exporter; +use List::Util qw(first min); use Tie::IxHash; use Date::Parse; use Date::Format; use Time::Local; +use List::Util qw( first min ); use FS::UID qw( dbh ); use FS::Conf; use FS::Record qw( qsearch qsearchs ); @@ -15,6 +19,9 @@ use FS::cdr_calltype; use FS::cdr_carrier; use FS::cdr_batch; use FS::cdr_termination; +use FS::rate; +use FS::rate_prefix; +use FS::rate_detail; @ISA = qw(FS::Record); @EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker ); @@ -22,6 +29,17 @@ use FS::cdr_termination; $DEBUG = 0; $me = '[FS::cdr]'; +#ask FS::UID to run this stuff for us later +FS::UID->install_callback( sub { + $conf = new FS::Conf; + + my @cdr_prerate_cdrtypenums; + $cdr_prerate = $conf->exists('cdr-prerate'); + @cdr_prerate_cdrtypenums = $conf->config('cdr-prerate-cdrtypenums') + if $cdr_prerate; + %cdr_prerate_cdrtypenums = map { $_=>1 } @cdr_prerate_cdrtypenums; +}); + =head1 NAME FS::cdr - Object methods for cdr records @@ -130,9 +148,9 @@ following fields are currently supported: =item svcnum - Link to customer service (see L) -=item freesidestatus - NULL, done (or something) +=item freesidestatus - NULL, processing-tiered, rated, done -=item freesiderewritestatus - NULL, done (or something) +=item freesiderewritestatus - NULL, done, skipped =item cdrbatch @@ -285,7 +303,7 @@ sub check { # ; # return $error if $error; - for my $f ( grep { $self->$_ =~ /[a-z ]/i } qw( startdate enddate ) ) { + for my $f ( grep { $self->$_ =~ /\D/ } qw(startdate answerdate enddate)){ $self->$f( str2time($self->$f) ); } @@ -392,22 +410,39 @@ sub set_charged_party { } -=item set_status_and_rated_price STATUS [ RATED_PRICE [ SVCNUM ] ] +=item set_status STATUS Sets the status to the provided string. If there is an error, returns the error, otherwise returns false. =cut +sub set_status { + my($self, $status) = @_; + $self->freesidestatus($status); + $self->replace; +} + +=item set_status_and_rated_price STATUS RATED_PRICE [ SVCNUM [ OPTION => VALUE ... ] ] + +Sets the status and rated price. + +Available options are: inbound, rated_pretty_dst, rated_regionname, +rated_seconds, rated_minutes, rated_granularity, rated_ratedetailnum, +rated_classnum, rated_ratename. + +If there is an error, returns the error, otherwise returns false. + +=cut + sub set_status_and_rated_price { my($self, $status, $rated_price, $svcnum, %opt) = @_; - if($opt{'inbound'}) { - my $term = qsearchs('cdr_termination', { - acctid => $self->acctid, - termpart => 1 # inbound - }); + + if ($opt{'inbound'}) { + + my $term = $self->cdr_termination( 1 ); #1: inbound my $error; - if($term) { + if ( $term ) { warn "replacing existing cdr status (".$self->acctid.")\n" if $term; $error = $term->delete; return $error if $error; @@ -417,16 +452,467 @@ sub set_status_and_rated_price { termpart => 1, rated_price => $rated_price, status => $status, - svcnum => $svcnum, }); + $term->rated_seconds($opt{rated_seconds}) if exists($opt{rated_seconds}); + $term->rated_minutes($opt{rated_minutes}) if exists($opt{rated_minutes}); + $term->svcnum($svcnum) if $svcnum; return $term->insert; - } - else { + + } else { + $self->freesidestatus($status); $self->rated_price($rated_price); + $self->$_($opt{$_}) + foreach grep exists($opt{$_}), map "rated_$_", + qw( pretty_dst regionname seconds minutes granularity + ratedetailnum classnum ratename ); $self->svcnum($svcnum) if $svcnum; return $self->replace(); + + } +} + +=item rate [ OPTION => VALUE ... ] + +Rates this CDR according and sets the status to 'rated'. + +Available options are: part_pkg, svcnum, single_price_included_minutes, region_group, region_group_included_minutes. + +part_pkg is required. + +If svcnum is specified, will also associate this CDR with the specified svcnum. + +single_price_included_minutes is requried for single_price price plans +(otherwise unused/ignored). It should be set to a scalar reference of the +number of included minutes and will be decremented by the rated minutes of this +CDR. + +region_group_included_minutes is required for prefix price plans which have +included minutes (otherwise unused/ignored). It should be set to a scalar +reference of the number of included minutes and will be decremented by the +rated minutes of this CDR. + +region_group_included_minutes_hashref is required for prefix price plans which +have included minues (otehrwise unused/ignored). It should be set to an empty +hashref at the start of a month's rating and then preserved across CDRs. + +=cut + +sub rate { + my( $self, %opt ) = @_; + my $part_pkg = $opt{'part_pkg'} or return "No part_pkg specified"; + + if ( $DEBUG > 1 ) { + warn "rating CDR $self\n". + join('', map { " $_ => ". $self->{$_}. "\n" } keys %$self ); + } + + my $rating_method = $part_pkg->option_cacheable('rating_method') || 'prefix'; + my $method = "rate_$rating_method"; + $self->$method(%opt); +} + +#here? +our %interval_cache = (); # for timed rates + +sub rate_prefix { + my( $self, %opt ) = @_; + my $part_pkg = $opt{'part_pkg'} or return "No part_pkg specified"; + + my $da_rewrote = 0; + # this will result in those CDRs being marked as done... is that + # what we want? + my @dirass = (); + if ( $part_pkg->option_cacheable('411_rewrite') ) { + my $dirass = $part_pkg->option_cacheable('411_rewrite'); + $dirass =~ s/\s//g; + @dirass = split(',', $dirass); + } + + if ( length($self->dst) && grep { $self->dst eq $_ } @dirass ) { + $self->dst('411'); + $da_rewrote = 1; + } + + my $reason = $part_pkg->check_chargable( $self, + 'da_rewrote' => $da_rewrote, + ); + if ( $reason ) { + warn "not charging for CDR ($reason)\n" if $DEBUG; + return $self->set_status_and_rated_price( 'rated', + 0, + $opt{'svcnum'}, + ); + } + + + ### + # look up rate details based on called station id + # (or calling station id for toll free calls) + ### + + my( $to_or_from, $number ); + if ( $self->is_tollfree && ! $part_pkg->option_cacheable('disable_tollfree') ) + { #tollfree call + $to_or_from = 'from'; + $number = $self->src; + } else { #regular call + $to_or_from = 'to'; + $number = $self->dst; + } + + warn "parsing call $to_or_from $number\n" if $DEBUG; + + #remove non-phone# stuff and whitespace + $number =~ s/\s//g; +# my $proto = ''; +# $dest =~ s/^(\w+):// and $proto = $1; #sip: +# my $siphost = ''; +# $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com + + #determine the country code + my $intl = $part_pkg->option_cacheable('international_prefix') || '011'; + my $countrycode = ''; + if ( $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/ + || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ + ) + { + + my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 ); + #first look for 1 digit country code + if ( qsearch('rate_prefix', { 'countrycode' => $one } ) ) { + $countrycode = $one; + $number = $u1.$u2.$rest; + } elsif ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) { #or 2 + $countrycode = $two; + $number = $u2.$rest; + } else { #3 digit country code + $countrycode = $three; + $number = $rest; + } + + } else { + my $domestic_prefix = $part_pkg->option_cacheable('domestic_prefix'); + $countrycode = length($domestic_prefix) ? $domestic_prefix : '1'; + $number =~ s/^$countrycode//;# if length($number) > 10; + } + + warn "rating call $to_or_from +$countrycode $number\n" if $DEBUG; + my $pretty_dst = "+$countrycode $number"; + #asterisks here causes inserting the detail to barf, so: + $pretty_dst =~ s/\*//g; + + my $eff_ratenum = $self->is_tollfree('accountcode') + ? $part_pkg->option_cacheable('accountcode_tollfree_ratenum') + : ''; + + my $ratename = ''; + my $intrastate_ratenum = $part_pkg->option_cacheable('intrastate_ratenum'); + if ( $intrastate_ratenum && !$self->is_tollfree ) { + $ratename = 'Interstate'; #until proven otherwise + # this is relatively easy only because: + # -assume all numbers are valid NANP numbers NOT in a fully-qualified format + # -disregard toll-free + # -disregard private or unknown numbers + # -there is exactly one record in rate_prefix for a given NPANXX + # -default to interstate if we can't find one or both of the prefixes + my $dstprefix = $self->dst; + $dstprefix =~ /^(\d{6})/; + $dstprefix = qsearchs('rate_prefix', { 'countrycode' => '1', + 'npa' => $1, + }) || ''; + my $srcprefix = $self->src; + $srcprefix =~ /^(\d{6})/; + $srcprefix = qsearchs('rate_prefix', { 'countrycode' => '1', + 'npa' => $1, + }) || ''; + if ($srcprefix && $dstprefix + && $srcprefix->state && $dstprefix->state + && $srcprefix->state eq $dstprefix->state) { + $eff_ratenum = $intrastate_ratenum; + $ratename = 'Intrastate'; # XXX possibly just use the ratename? + } + } + + $eff_ratenum ||= $part_pkg->option_cacheable('ratenum'); + my $rate = qsearchs('rate', { 'ratenum' => $eff_ratenum }) + or die "ratenum $eff_ratenum not found!"; + + my @ltime = localtime($self->startdate); + my $weektime = $ltime[0] + + $ltime[1]*60 + #minutes + $ltime[2]*3600 + #hours + $ltime[6]*86400; #days since sunday + # if there's no timed rate_detail for this time/region combination, + # dest_detail returns the default. There may still be a timed rate + # that applies after the starttime of the call, so be careful... + my $rate_detail = $rate->dest_detail({ 'countrycode' => $countrycode, + 'phonenum' => $number, + 'weektime' => $weektime, + 'cdrtypenum' => $self->cdrtypenum, + }); + + unless ( $rate_detail ) { + + if ( $part_pkg->option_cacheable('ignore_unrateable') ) { + + if ( $part_pkg->option_cacheable('ignore_unrateable') == 2 ) { + # mark the CDR as unrateable + return $self->set_status_and_rated_price( + 'failed', + '', + $opt{'svcnum'}, + ); + } elsif ( $part_pkg->option_cacheable('ignore_unrateable') == 1 ) { + # warn and continue + warn "no rate_detail found for CDR.acctid: ". $self->acctid. + "; skipping\n"; + return ''; + + } else { + die "unknown ignore_unrateable, pkgpart ". $part_pkg->pkgpart; + } + + } else { + + die "FATAL: no rate_detail found in ". + $rate->ratenum. ":". $rate->ratename. " rate plan ". + "for +$countrycode $number (CDR acctid ". $self->acctid. "); ". + "add a rate or set ignore_unrateable flag on the package def\n"; + } + + } + + my $rate_region = $rate_detail->dest_region; + my $regionnum = $rate_region->regionnum; + warn " found rate for regionnum $regionnum ". + "and rate detail $rate_detail\n" + if $DEBUG; + + if ( !exists($interval_cache{$regionnum}) ) { + my @intervals = ( + sort { $a->stime <=> $b->stime } + map { $_->rate_time->intervals } + qsearch({ 'table' => 'rate_detail', + 'hashref' => { 'ratenum' => $rate->ratenum }, + 'extra_sql' => 'AND ratetimenum IS NOT NULL', + }) + ); + $interval_cache{$regionnum} = \@intervals; + warn " cached ".scalar(@intervals)." interval(s)\n" + if $DEBUG; + } + + ### + # find the price and add detail to the invoice + ### + + # About this section: + # We don't round _anything_ (except granularizing) + # until the final $charge = sprintf("%.2f"...). + + my $seconds_left = $part_pkg->option_cacheable('use_duration') + ? $self->duration + : $self->billsec; + # charge for the first (conn_sec) seconds + my $seconds = min($seconds_left, $rate_detail->conn_sec); + $seconds_left -= $seconds; + $weektime += $seconds; + my $charge = $rate_detail->conn_charge; + + my $etime; + while($seconds_left) { + my $ratetimenum = $rate_detail->ratetimenum; # may be empty + + # find the end of the current rate interval + if(@{ $interval_cache{$regionnum} } == 0) { + # There are no timed rates in this group, so just stay + # in the default rate_detail for the entire duration. + # Set an "end" of 1 past the end of the current call. + $etime = $weektime + $seconds_left + 1; + } + elsif($ratetimenum) { + # This is a timed rate, so go to the etime of this interval. + # If it's followed by another timed rate, the stime of that + # interval should match the etime of this one. + my $interval = $rate_detail->rate_time->contains($weektime); + $etime = $interval->etime; + } + else { + # This is a default rate, so use the stime of the next + # interval in the sequence. + my $next_int = first { $_->stime > $weektime } + @{ $interval_cache{$regionnum} }; + if ($next_int) { + $etime = $next_int->stime; + } + else { + # weektime is near the end of the week, so decrement + # it by a full week and use the stime of the first + # interval. + $weektime -= (3600*24*7); + $etime = $interval_cache{$regionnum}->[0]->stime; + } + } + + my $charge_sec = min($seconds_left, $etime - $weektime); + + $seconds_left -= $charge_sec; + + my $included_min = $opt{'region_group_included_min_hashref'} || {}; + + $included_min->{$regionnum}{$ratetimenum} = $rate_detail->min_included + unless exists $included_min->{$regionnum}{$ratetimenum}; + + my $granularity = $rate_detail->sec_granularity; + + my $minutes; + if ( $granularity ) { # charge per minute + # Round up to the nearest $granularity + if ( $charge_sec and $charge_sec % $granularity ) { + $charge_sec += $granularity - ($charge_sec % $granularity); + } + $minutes = $charge_sec / 60; #don't round this + } + else { # per call + $minutes = 1; + $seconds_left = 0; + } + + $seconds += $charge_sec; + + my $region_group = ($part_pkg->option_cacheable('min_included') || 0) > 0; + + ${$opt{region_group_included_min}} -= $minutes + if $region_group && $rate_detail->region_group; + + $included_min->{$regionnum}{$ratetimenum} -= $minutes; + if ( + $included_min->{$regionnum}{$ratetimenum} <= 0 + && ( ${$opt{region_group_included_min}} <= 0 + || ! $rate_detail->region_group + ) + ) + { + #should preserve (display?) this + my $charge_min = 0 - $included_min->{$regionnum}{$ratetimenum}; + $included_min->{$regionnum}{$ratetimenum} = 0; + $charge += ($rate_detail->min_charge * $charge_min); #still not rounded + + } elsif ( ${$opt{region_group_included_min}} > 0 + && $region_group + && $rate_detail->region_group + ) + { + $included_min->{$regionnum}{$ratetimenum} = 0 + } + + # choose next rate_detail + $rate_detail = $rate->dest_detail({ 'countrycode' => $countrycode, + 'phonenum' => $number, + 'weektime' => $etime, + 'cdrtypenum' => $self->cdrtypenum }) + if($seconds_left); + # we have now moved forward to $etime + $weektime = $etime; + + } #while $seconds_left + + # this is why we need regionnum/rate_region.... + warn " (rate region $rate_region)\n" if $DEBUG; + + $self->set_status_and_rated_price( + 'rated', + sprintf('%.2f', $charge + 0.000001), # NOW round it. + $opt{'svcnum'}, + 'rated_pretty_dst' => $pretty_dst, + 'rated_regionname' => $rate_region->regionname, + 'rated_seconds' => $seconds, + 'rated_granularity' => $rate_detail->sec_granularity, #$granularity + 'rated_ratedetailnum' => $rate_detail->ratedetailnum, + 'rated_classnum' => $rate_detail->classnum, #rated_ratedetailnum? + 'rated_ratename' => $ratename, #not rate_detail - Intrastate/Interstate + ); + +} + +sub rate_upstream_simple { + my( $self, %opt ) = @_; + + $self->set_status_and_rated_price( + 'rated', + sprintf('%.3f', $self->upstream_price), + $opt{'svcnum'}, + 'rated_classnum' => $self->calltypenum, + ); +} + +sub rate_single_price { + my( $self, %opt ) = @_; + my $part_pkg = $opt{'part_pkg'} or return "No part_pkg specified"; + + # a little false laziness w/abov + # $rate_detail = new FS::rate_detail({sec_granularity => ... }) ? + + my $granularity = length($part_pkg->option_cacheable('sec_granularity')) + ? $part_pkg->option_cacheable('sec_granularity') + : 60; + + my $seconds = $part_pkg->option_cacheable('use_duration') + ? $self->duration + : $self->billsec; + + $seconds += $granularity - ( $seconds % $granularity ) + if $seconds # don't granular-ize 0 billsec calls (bills them) + && $granularity # 0 is per call + && $seconds % $granularity; + my $minutes = $granularity ? ($seconds / 60) : 1; + + my $charge_min = $minutes; + + ${$opt{single_price_included_min}} -= $minutes; + if ( ${$opt{single_price_included_min}} > 0 ) { + $charge_min = 0; + } else { + $charge_min = 0 - ${$opt{single_price_included_min}}; + ${$opt{single_price_included_min}} = 0; } + + my $charge = + sprintf('%.4f', ( $part_pkg->option_cacheable('min_charge') * $charge_min ) + + 0.0000000001 ); #so 1.00005 rounds to 1.0001 + + $self->set_status_and_rated_price( + 'rated', + $charge, + $opt{'svcnum'}, + 'rated_granularity' => $granularity, + 'rated_seconds' => $seconds, + ); + +} + +=item cdr_termination [ TERMPART ] + +=cut + +sub cdr_termination { + my $self = shift; + + if ( scalar(@_) && $_[0] ) { + my $termpart = shift; + + qsearchs('cdr_termination', { acctid => $self->acctid, + termpart => $termpart, + } + ); + + } else { + + qsearch('cdr_termination', { acctid => $self->acctid, } ); + + } + } =item calldate_unix @@ -525,6 +1011,10 @@ my %export_names = ( 'invoice_header' => "Date,Time,Called From,Destination,Duration,Price", #"Date,Time,Name,Called From,Destination,Duration,Price", }, + 'basic' => { + 'name' => 'Basic', + 'invoice_header' => "Date/Time,Called Number,Min/Sec,Price", + }, 'default' => { 'name' => 'Default', 'invoice_header' => 'Date,Time,Number,Destination,Duration,Price', @@ -537,6 +1027,22 @@ my %export_names = ( 'name' => 'Default plus accountcode', 'invoice_header' => 'Date,Time,Account,Number,Destination,Duration,Price', }, + 'description_default' => { + 'name' => 'Default with description field as destination', + 'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price', + }, + 'sum_duration' => { + 'name' => 'Summary, one line per service', + 'invoice_header' => 'Caller,Rate,Calls,Minutes,Price', + }, + 'sum_count' => { + 'name' => 'Number of calls, one line per service', + 'invoice_header' => 'Caller,Rate,Messages,Price', + }, + 'sum_duration_prefix' => { + 'name' => 'Summary, one line per destination prefix', + 'invoice_header' => 'Caller,Rate,Calls,Minutes,Price', + }, ); my %export_formats = (); @@ -548,17 +1054,40 @@ sub export_formats { my $conf = new FS::Conf; my $date_format = $conf->config('date_format') || '%m/%d/%Y'; + # call duration in the largest units that accurately reflect the granularity my $duration_sub = sub { my($cdr, %opt) = @_; - if ( $opt{minutes} ) { - $opt{minutes}. ( $opt{granularity} ? 'm' : ' call' ); - } else { - #config if anyone really wants decimal minutes back - #sprintf('%.2fm', $cdr->billsec / 60 ); - int($cdr->billsec / 60).'m '. ($cdr->billsec % 60).'s'; + my $sec = $opt{seconds} || $cdr->billsec; + if ( defined $opt{granularity} && + $opt{granularity} == 0 ) { #per call + return '1 call'; + } + elsif ( defined $opt{granularity} && $opt{granularity} == 60 ) {#full minutes + my $min = int($sec/60); + $min++ if $sec%60; + return $min.'m'; + } + else { #anything else + return sprintf("%dm %ds", $sec/60, $sec%60); } }; + my $price_sub = sub { + my ($cdr, %opt) = @_; + my $price; + if ( defined($opt{charge}) ) { + $price = $opt{charge}; + } + elsif ( $opt{inbound} ) { + my $term = $cdr->cdr_termination(1); # 1 = inbound + $price = $term->rated_price if defined $term; + } + else { + $price = $cdr->rated_price; + } + length($price) ? ($opt{money_char} . $price) : ''; + }; + %export_formats = ( 'simple' => [ sub { time2str($date_format, shift->calldate_unix ) }, #DATE @@ -567,7 +1096,7 @@ sub export_formats { 'dst', #NUMBER_DIALED $duration_sub, #DURATION #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE - sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE + $price_sub, ], 'simple2' => [ sub { time2str($date_format, shift->calldate_unix ) }, #DATE @@ -577,7 +1106,28 @@ sub export_formats { 'dst', #NUMBER_DIALED $duration_sub, #DURATION #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE - sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE + $price_sub, + ], + 'sum_duration' => [ + # for summary formats, the CDR is a fictitious object containing the + # total billsec and the phone number of the service + 'src', + sub { my($cdr, %opt) = @_; $opt{ratename} }, + sub { my($cdr, %opt) = @_; $opt{count} }, + sub { my($cdr, %opt) = @_; int($opt{seconds}/60).'m' }, + $price_sub, + ], + 'sum_count' => [ + 'src', + sub { my($cdr, %opt) = @_; $opt{ratename} }, + sub { my($cdr, %opt) = @_; $opt{count} }, + $price_sub, + ], + 'basic' => [ + sub { time2str('%d %b - %I:%M %p', shift->calldate_unix) }, + 'dst', + $duration_sub, + $price_sub, ], 'default' => [ @@ -599,8 +1149,7 @@ sub export_formats { $duration_sub, #PRICE - sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, - + $price_sub, ], ); $export_formats{'source_default'} = [ 'src', @{ $export_formats{'default'} }, ]; @@ -609,10 +1158,35 @@ sub export_formats { 'accountcode', @{ $export_formats{'default'} }[2..5], ]; + my @default = @{ $export_formats{'default'} }; + $export_formats{'description_default'} = + [ 'src', @default[0..2], + sub { my($cdr, %opt) = @_; $cdr->description }, + @default[4,5] ]; - %export_formats + return %export_formats; } +=item downstream_csv OPTION => VALUE ... + +Returns a string of formatted call details for display on an invoice. + +Options: + +format + +charge - override the 'rated_price' field of the CDR + +seconds - override the 'billsec' field of the CDR + +count - number of usage events included in this record, for summary formats + +ratename - name of the rate table used to rate this call + +granularity + +=cut + sub downstream_csv { my( $self, %opt ) = @_; @@ -634,6 +1208,8 @@ sub downstream_csv { } @{ $formats{$format} }; + return @columns if defined $opt{'keeparray'}; + my $status = $csv->combine(@columns); die "FS::CDR: error combining ". $csv->error_input(). "into downstream CSV" unless $status; @@ -655,6 +1231,8 @@ as keys (for use with part_pkg::voip_cdr) and "pretty" format names as values. =cut +# in the future, load this dynamically from detail_format classes + sub invoice_formats { map { ($_ => $export_names{$_}->{'name'}) } grep { $export_names{$_}->{'invoice_header'} } @@ -672,6 +1250,60 @@ sub invoice_header { $export_names{$format}->{'invoice_header'}; } +=item clear_status + +Clears cdr and any associated cdr_termination statuses - used for +CDR reprocessing. + +=cut + +sub clear_status { + my $self = shift; + my %opt = @_; + + 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; + + if ( $cdr_prerate && $cdr_prerate_cdrtypenums{$self->cdrtypenum} + && $self->rated_ratedetailnum #avoid putting old CDRs back in "rated" + && $self->freesidestatus eq 'done' + && ! $opt{'rerate'} + ) + { #special case + $self->freesidestatus('rated'); + } else { + $self->freesidestatus(''); + } + + my $error = $self->replace; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + + foreach my $cdr_termination ( $self->cdr_termination ) { + #$cdr_termination->status(''); + #$error = $cdr_termination->replace; + $error = $cdr_termination->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + + ''; +} + =item import_formats Returns an ordered list of key value pairs containing import format names @@ -768,8 +1400,11 @@ sub _cdr_date_parse { 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|$)/ ) { + } 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|$)/ ) { + # 8/26/2010 12:20:01 + # optionally without seconds ($mon, $day, $year, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); + $sec = 0 if !defined($sec); } elsif ( $date =~ /^\s*(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d+\.\d+)(\D|$)/ ) { # broadsoft: 20081223201938.314 ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 ); @@ -779,6 +1414,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... } @@ -829,7 +1468,7 @@ my %import_options = ( }, #drop the || 'csv' to allow auto xls for csv types? - 'format_types' => { map { $_ => ( lc($cdr_info{$_}->{'type'}) || 'csv' ); } + 'format_types' => { map { $_ => lc($cdr_info{$_}->{'type'} || 'csv'); } keys %cdr_info }, @@ -846,6 +1485,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 }, @@ -861,6 +1505,14 @@ sub batch_import { my $iopt = _import_options; $opt->{$_} = $iopt->{$_} foreach keys %$iopt; + if ( defined $opt->{'cdrtypenum'} ) { + $opt->{'preinsert_callback'} = sub { + my($record,$param) = (shift,shift); + $record->cdrtypenum($opt->{'cdrtypenum'}); + ''; + }; + } + FS::Record::batch_import( $opt ); }