X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Fenswitch.pm;h=1cdd802fc0a2b8e8121645e1932458d3e902113c;hb=f23f9340aeaa5e128d4319a9e824dfe94f1e1a3a;hp=1475d8dc19b4080351f98d20b09a88e061109b33;hpb=3595df85a4211d9da1fd3bd8cbb0f324881491d9;p=freeside.git

diff --git a/FS/FS/cdr/enswitch.pm b/FS/FS/cdr/enswitch.pm
index 1475d8dc1..1cdd802fc 100644
--- a/FS/FS/cdr/enswitch.pm
+++ b/FS/FS/cdr/enswitch.pm
@@ -1,11 +1,10 @@
 package FS::cdr::enswitch;
+use base qw( FS::cdr );
 
 use strict;
-use vars qw( @ISA %info $tmp_mon $tmp_mday $tmp_year );
-use Time::Local;
-use FS::cdr qw(_cdr_min_parser_maker);
-
-@ISA = qw(FS::cdr);
+use vars qw( %info $tmp_mon $tmp_mday $tmp_year );
+use FS::Record qw( qsearchs );
+use FS::cdr_type;
 
 %info = (
   'name'          => 'Enswitch',
@@ -13,26 +12,30 @@ use FS::cdr qw(_cdr_min_parser_maker);
   'header'        => 2,
   'type'          => 'csv',
   'import_fields' => [
-    'disposition',  #Status
+    'dcontext',     #Status
     'startdate',    #Start, already a unix timestamp
     skip(2),        #Start date, Start time
     'enddate',      #End
     skip(4),        #End date, End time
                     #Calling customer, Calling type
-    'src',          #Calling number
-    'clid',         #Calling name
+    'src',          #Calling number     
     skip(1),        #Called type
-    'dst',          #Called number
-    skip(5),        #Destination customer, Destination type
+
+    sub { my ($cdr, $dst) = @_; 
+        $dst =~ s/\*//g;
+	$cdr->set('dst', $dst);
+    },              #Called number
+
+    skip(14),       #Destination customer, Destination type
                     #Destination number
                     #Destination group ID, Destination group name,
-    'in_calling_type',  #Inbound calling type,
-    \&in_calling_num,   #Inbound calling number,
-    '',                 #Inbound called type,
-    \&in_called_num,    #Inbound called number,
-    skip(14),
+    		    #Inbound calling type,
+    		    #Inbound calling number,
+                    #Inbound called type,
+    		    #Inbound called number,
                     #Inbound destination type, Inbound destination number,
-                    #Outbound calling type, Outbound calling number,
+    'disposition',  #Outbound calling type,
+      skip(11),     #Outbound calling number,
                     #Outbound called type, Outbound called number,
                     #Outbound destination type, Outbound destination number,
                     #Internal calling type, Internal calling number,
@@ -41,7 +44,8 @@ use FS::cdr qw(_cdr_min_parser_maker);
     'duration',     #Total seconds
     skip(1),        #Ring seconds
     'billsec',      #Billable seconds
-    'upstream_price', #Cost
+    skip(2),        #Cost
+    	            #Cost including taxes
     'accountcode',  #Billing customer
     skip(3),        #Billing customer name, Billing type, Billing reference
   ],
@@ -49,14 +53,23 @@ use FS::cdr qw(_cdr_min_parser_maker);
 
 sub skip { map {''} (1..$_[0]) }
 
-sub in_calling_num {
+#create CDR types with names matching in_calling_type valuesj - 'none'
+# (without the quotes) for blank
+our %cdr_type = ();
+sub in_calling_type {
   my ($record, $data) = @_;
-  $record->src($data) if ( ($record->in_calling_type || '') eq 'external' );
-}
 
-sub in_called_num {
-  my ($record, $data) = @_;
-  $record->dst($data) if ( ($record->in_calling_type || '') eq 'external' );
+  $data ||= 'none';
+
+  my $cdr_type = exists($cdr_type{$data})
+                   ? $cdr_type{$data}
+                   : qsearchs('cdr_type', { 'cdrtypename' => $data } );
+
+  $cdr_type{$data} = $cdr_type;
+
+  $record->set('in_calling_type', $data); #for below
+  $record->set('cdrtypenum', $cdr_type->cdrtypenum) if $cdr_type;
+
 }
 
 1;