[freeside-commits] freeside/FS/FS/part_pkg voip_cdr.pm, 1.3.2.15, 1.3.2.16

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv18141

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	voip_cdr.pm 
Log Message:
not enough sleep to support multiple internal_prefixen, RT#3985

Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.3.2.15
retrieving revision 1.3.2.16
diff -u -d -r1.3.2.15 -r1.3.2.16
--- voip_cdr.pm	12 Sep 2008 22:18:08 -0000	1.3.2.15
+++ voip_cdr.pm	12 Sep 2008 22:38:02 -0000	1.3.2.16
@@ -227,11 +227,11 @@
           }
 
           #determine the country code
+          my $intl_match = 0;
+          foreach (@intl) { $number =~ /^$_(((\d)(\d))(\d))(\d+)$/ and do { $intl_match++; last; }; }
+
           my $countrycode;
-          if ( ( grep { $number =~ /^$_(((\d)(\d))(\d))(\d+)$/ } @intl )
-               || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/
-             )
-          {
+          if ( $intl_match || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ ) {
 
             my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
             #first look for 1 digit country code