X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Fcisco.pm;h=f9b9befbce6ad952efd9485dd5f5d416710387fb;hb=5716d52ab6d97510b5e470d53a4feb50d34a11c7;hp=93599017d6e2e0a0f94dc45b1a795fc2e2037268;hpb=3aec21e14476ee3d33d4cf92e029e8543dabf009;p=freeside.git

diff --git a/FS/FS/cdr/cisco.pm b/FS/FS/cdr/cisco.pm
index 93599017d..f9b9befbc 100644
--- a/FS/FS/cdr/cisco.pm
+++ b/FS/FS/cdr/cisco.pm
@@ -4,6 +4,7 @@ use strict;
 use base qw( FS::cdr );
 use vars qw( %info );
 use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
+use Date::Parse;
 
 %info = (
   'name'          => 'Cisco Unified Call Manager',
@@ -20,11 +21,15 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
 							#globalCallID_callManagerId
 					      'clid',	#globalCallID_callId	
 					     skip(1),	#origLegCallIdentifier	
-                 			 'startdate',	#dateTimeOrigination
+                sub { my ($cdr, $calldate) = @_;
+                        $cdr->set('startdate', $calldate);
+                        $calldate = str2time($calldate);
+                        $cdr->set('calldate', $calldate);
+                                                  },    #dateTimeOrigination
 					     skip(3),   #origNodeId	
 							#origSpan
 							#origIpAddr	
-					       'src',	#callingPartyNumber	
+           				       'src',	#callingPartyNumber	
 					    skip(20),	#callingPartyUnicodeLoginUserID	
 							#origCause_location	
 							#origCause_value	
@@ -45,7 +50,10 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
 							#destNodeId	
 							#destSpan	
 							#destIpAddr	
-					      'dst',	#originalCalledPartyNumber	
+		sub { my ($cdr, $dst) = @_;
+		$dst =~ s/\#//;
+		$cdr->set('dst', $dst);			      
+						},	#originalCalledPartyNumber	
 					   skip(17),	#finalCalledPartyNumber	
 							#finalCalledPartyUnicodeLoginUserID
 							#destCause_location	
@@ -72,7 +80,7 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
 							#finalCalledPartyNumberPartition
 							#lastRedirectDnPartition
 				       'billsec',	#duration
-					skip(48),	#origDeviceName
+					skip(22),	#origDeviceName
 							#destDeviceName
 							#origCallTerminationOnBehalfOf
 							#destCallTerminationOnBehalfOf
@@ -94,8 +102,12 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
 							#origMediaCap_Bandwidth
 							#destMediaCap_Bandwidth	
 							#authorizationCodeValue
-							#outpulsedCallingPartyNumber
-							#outpulsedCalledPartyNumber
+					sub { my ($cdr, $number) = @_;
+						if ($number){
+						$cdr->set('src',$number);
+						}
+						},	#outpulsedCallingPartyNumber
+					      skip(23), #outpulsedCalledPartyNumber
 							#origIpv4v6Addr	
 							#destIpv4v6Addr	
 							#origVideoCap_Codec_Channel2