Add Broadsoft CDR record format

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 3735274..c5b2ab9 100644 (file)
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -715,6 +715,9 @@ sub _cdr_date_parse {
     ($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 );
+  } 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);
   } else {
      die "unparsable date: $date"; #maybe we shouldn't die...
   }

diff --git a/FS/FS/cdr/broadsoft.pm b/FS/FS/cdr/broadsoft.pm
new file mode 100644 (file)
index 0000000..423e96f
--- /dev/null
+++ b/FS/FS/cdr/broadsoft.pm
@@ -0,0 +1,108 @@
+package FS::cdr::broadsoft;
+
+use strict;
+use base qw( FS::cdr );
+use vars qw( %info );
+use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
+
+%info = (
+  'name'          => 'Broadsoft',
+  'weight'        => 500,
+  'header'        => 1,     #0 default, set to 1 to ignore the first line, or
+                            # to higher numbers to ignore that number of lines
+  'type'          => 'csv', #csv (default), fixedlength or xls
+  'sep_char'      => ',',   #for csv, defaults to ,
+  'disabled'      => 0,     #0 default, set to 1 to disable
+
+  #listref of what to do with each field from the CDR, in order
+  'import_fields' => [
+    
+    skip(2),
+    sub { my($cdr, $data, $conf, $param) = @_;
+          $param->{skiprow} = 1 if lc($data) ne 'normal';
+          '' },                                   #  3: type
+            
+    trim('accountcode'),                          #  4: userNumber
+    skip(2),
+    trim('src'),                                  #  7: callingNumber
+    skip(1),
+    trim('dst'),                                  #  9: calledNumber
+
+    _cdr_date_parser_maker('startdate'),          # 10: startTime
+    skip(1),
+    sub { my($cdr, $data) = @_;
+          $cdr->disposition(
+            lc($data) eq 'yes' ? 
+            'ANSWERED' : 'NO ANSWER') },          # 12: answerIndicator
+    _cdr_date_parser_maker('answerdate'),         # 13: answerTime
+    _cdr_date_parser_maker('enddate'),            # 14: releaseTime
+    
+  ],
+
+);
+
+sub trim {
+  my $fieldname = shift;
+  return sub {
+    my($cdr, $data) = @_;
+    $data =~ s/^\+1//;
+    $cdr->$fieldname($data);
+    ''
+  }
+}
+
+sub skip {
+  map { undef } (1..$_[0]);
+}
+
+1;
+
+__END__
+
+list of freeside CDR fields, useful ones marked with *
+
+           acctid - primary key
+    *[1]   calldate - Call timestamp (SQL timestamp)
+           clid - Caller*ID with text
+7   *      src - Caller*ID number / Source number
+9   *      dst - Destination extension
+           dcontext - Destination context
+           channel - Channel used
+           dstchannel - Destination channel if appropriate
+           lastapp - Last application if appropriate
+           lastdata - Last application data
+10  *      startdate - Start of call (UNIX-style integer timestamp)
+13         answerdate - Answer time of call (UNIX-style integer timestamp)
+14  *      enddate - End time of call (UNIX-style integer timestamp)
+    *      duration - Total time in system, in seconds
+    *      billsec - Total time call is up, in seconds
+12  *[2]   disposition - What happened to the call: ANSWERED, NO ANSWER, BUSY
+           amaflags - What flags to use: BILL, IGNORE etc, specified on a per
+           channel basis like accountcode.
+4   *[3]   accountcode - CDR account number to use: account
+           uniqueid - Unique channel identifier
+           userfield - CDR user-defined field
+           cdr_type - CDR type - see FS::cdr_type (Usage = 1, S&E = 7, OC&C = 8)
+    *[4]   charged_party - Service number to be billed
+           upstream_currency - Wholesale currency from upstream
+    *[5]   upstream_price - Wholesale price from upstream
+           upstream_rateplanid - Upstream rate plan ID
+           rated_price - Rated (or re-rated) price
+           distance - km (need units field?)
+           islocal - Local - 1, Non Local = 0
+    *[6]   calltypenum - Type of call - see FS::cdr_calltype
+           description - Description (cdr_type 7&8 only) (used for
+           cust_bill_pkg.itemdesc)
+           quantity - Number of items (cdr_type 7&8 only)
+           carrierid - Upstream Carrier ID (see FS::cdr_carrier)
+           upstream_rateid - Upstream Rate ID
+           svcnum - Link to customer service (see FS::cust_svc)
+           freesidestatus - NULL, done (or something)
+
+[1] Auto-populated from startdate if not present
+[2] Package options available to ignore calls without a specific disposition
+[3] When using 'cdr-charged_party-accountcode' config
+[4] Auto-populated from src (normal calls) or dst (toll free calls) if not present
+[5] When using 'upstream_simple' rating method.
+[6] Set to usage class classnum when using pre-rated CDRs and usage class-based
+    taxation (local/intrastate/interstate/international)