X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Fcisco.pm;h=2da5a94e1b555cd80244e3c8524905dd001cfe80;hb=57bb423fe457ba4e13726877f53bcdf944f828f8;hp=4d0850775305ee98d2c87dab694dbf202af2c0ea;hpb=7432b2f86473986a05b4107e218c997549b8ee2f;p=freeside.git

diff --git a/FS/FS/cdr/cisco.pm b/FS/FS/cdr/cisco.pm
index 4d0850775..2da5a94e1 100644
--- a/FS/FS/cdr/cisco.pm
+++ b/FS/FS/cdr/cisco.pm
@@ -4,7 +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;
+use Date::Parse;
 
 %info = (
   'name'          => 'Cisco Unified Call Manager',
@@ -29,7 +29,7 @@ use Date:Parse;
 					     skip(3),   #origNodeId	
 							#origSpan
 							#origIpAddr	
-					       'src',	#callingPartyNumber	
+           				       'src',	#callingPartyNumber	
 					    skip(20),	#callingPartyUnicodeLoginUserID	
 							#origCause_location	
 							#origCause_value	
@@ -50,7 +50,10 @@ use Date:Parse;
 							#destNodeId	
 							#destSpan	
 							#destIpAddr	
-					      'dst',	#originalCalledPartyNumber	
+		sub { my ($cdr, $dst) = @_;
+		$dst =~ s/\#//;
+		$cdr->set('dst', $dst);			      
+						},	#originalCalledPartyNumber	
 					   skip(17),	#finalCalledPartyNumber	
 							#finalCalledPartyUnicodeLoginUserID
 							#destCause_location	
@@ -70,14 +73,14 @@ use Date:Parse;
 							#destRSVPVideoStat
 					'answerdate',	#dateTimeConnect	
 		   			   'enddate',	#dateTimeDisconnect
-					skip(6),	#lastRedirectDn	
+					skip(3),	#lastRedirectDn	
 							#pkid
 							#originalCalledPartyNumberPartition	
-							#callingPartyNumberPartition	
-							#finalCalledPartyNumberPartition
+				   'accountcode',	#callingPartyNumberPartition	
+					 skip(2),	#finalCalledPartyNumberPartition
 							#lastRedirectDnPartition
 				       'billsec',	#duration
-					skip(48),	#origDeviceName
+					skip(23),	#origDeviceName
 							#destDeviceName
 							#origCallTerminationOnBehalfOf
 							#destCallTerminationOnBehalfOf
@@ -99,8 +102,8 @@ use Date:Parse;
 							#origMediaCap_Bandwidth
 							#destMediaCap_Bandwidth	
 							#authorizationCodeValue
-							#outpulsedCallingPartyNumber
-							#outpulsedCalledPartyNumber
+					        	#outpulsedCallingPartyNumber
+					      skip(23), #outpulsedCalledPartyNumber
 							#origIpv4v6Addr	
 							#destIpv4v6Addr	
 							#origVideoCap_Codec_Channel2
@@ -131,7 +134,6 @@ use Date:Parse;
 
 
 
-
 sub skip { map {''} (1..$_[0]) }
 
 1;