=item freesidestatus - NULL, done (or something)
+=item cdrbatch
+
=back
=head1 METHODS
my $error =
$self->ut_numbern('acctid')
- #Usage = 1, S&E = 7, OC&C = 8
- || $self->ut_foreign_keyn('cdrtypenum', 'cdr_type', 'cdrtypenum' )
-
- #the big list in appendix 2
- || $self->ut_foreign_keyn('calltypenum', 'cdr_calltype', 'calltypenum' )
-
- # Telstra =1, Optus = 2, RSL COM = 3
- || $self->ut_foreign_keyn('carrierid', 'cdr_carrier', 'carrierid' )
+ #add a config option to turn these back on if someone needs 'em
+ #
+ # #Usage = 1, S&E = 7, OC&C = 8
+ # || $self->ut_foreign_keyn('cdrtypenum', 'cdr_type', 'cdrtypenum' )
+ #
+ # #the big list in appendix 2
+ # || $self->ut_foreign_keyn('calltypenum', 'cdr_calltype', 'calltypenum' )
+ #
+ # # Telstra =1, Optus = 2, RSL COM = 3
+ # || $self->ut_foreign_keyn('carrierid', 'cdr_carrier', 'carrierid' )
;
return $error if $error;
sub _cdr_min_parser_maker {
my $field = shift;
my @fields = ref($field) ? @$field : ($field);
+ @fields = qw( billsec duration ) unless scalar(@fields);
return sub {
my( $cdr, $min ) = @_;
my $sec = eval { _cdr_min_parse($min) };
}
sub _cdr_date_parser_maker {
- my $field = shift || [qw( billsec duration )];
+ my $field = shift;
return sub {
my( $cdr, $date ) = @_;
#$cdr->$field( _cdr_date_parse($date) );
my $fh = $param->{filehandle};
my $format = $param->{format};
+ my $cdrbatch = $param->{cdrbatch};
return "Unknown format $format"
unless exists( $cdr_info{$format} )
if ( $type eq 'csv' ) {
eval "use Text::CSV_XS;";
die $@ if $@;
- $parser = new Text::CSV_XS;
+ 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 $@;
}
@{ $info->{'import_fields'} }
;
+
+ $cdr{cdrbatch} = $cdrbatch;
my $cdr = new FS::cdr ( \%cdr );
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
#might want to disable this if we skip records for any reason...
- return "Empty file!" unless $imported;
+ return "Empty file!" unless $imported || $param->{empty_ok};
'';