[freeside-commits] branch master updated. 3aa8e8b2abef2b75a4caec6e1d62ce5c966f3efe

[Jeremy Davis]

The branch, master has been updated
       via  3aa8e8b2abef2b75a4caec6e1d62ce5c966f3efe (commit)
      from  b7d918470cb8018332c05d17ef989ed4e9740ed3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3aa8e8b2abef2b75a4caec6e1d62ce5c966f3efe
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Fri Jun 20 13:35:30 2014 -0400

    28898 Change to cisco format

diff --git a/FS/FS/cdr/cisco.pm b/FS/FS/cdr/cisco.pm
index ebb2d00..f9b9bef 100644
--- a/FS/FS/cdr/cisco.pm
+++ b/FS/FS/cdr/cisco.pm
@@ -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	
@@ -77,7 +80,7 @@ use Date::Parse;
 							#finalCalledPartyNumberPartition
 							#lastRedirectDnPartition
 				       'billsec',	#duration
-					skip(48),	#origDeviceName
+					skip(22),	#origDeviceName
 							#destDeviceName
 							#origCallTerminationOnBehalfOf
 							#destCallTerminationOnBehalfOf
@@ -99,8 +102,12 @@ use Date::Parse;
 							#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

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr/cisco.pm |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)