[freeside-commits] freeside/FS/FS/part_pkg voip_cdr.pm, 1.108.2.6, 1.108.2.7

[Mark Wells]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	voip_cdr.pm 
Log Message:
skip_dst_prefix, #13895

Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.108.2.6
retrieving revision 1.108.2.7
diff -u -w -d -r1.108.2.6 -r1.108.2.7
--- voip_cdr.pm	16 Jun 2011 22:57:05 -0000	1.108.2.6
+++ voip_cdr.pm	2 Aug 2011 20:57:35 -0000	1.108.2.7
@@ -870,6 +870,11 @@
     if $opt{'ignore_disposition'} =~ /\S/
     && grep { $cdr->disposition eq $_ } split(/\s*,\s*/, $opt{'ignore_disposition'});
 
+  foreach(split(/\s*,\s*/, $opt{'skip_dst_prefix'})) {
+    return "dst starts with '$_'"
+    if length($_) && substr($cdr->dst,0,length($_)) eq $_;
+  }
+
   return "carrierid != $opt{'use_carrierid'}"
     if length($opt{'use_carrierid'})
     && $cdr->carrierid ne $opt{'use_carrierid'} #ne otherwise 0 matches ''
@@ -883,11 +888,6 @@
     if length($opt{'ignore_cdrtypenum'})
     && $cdr->cdrtypenum eq $opt{'ignore_cdrtypenum'}; #eq otherwise 0 matches ''
 
-  foreach(split(',',$opt{'skip_dst_prefix'})) {
-    return "dst starts with '$_'"
-    if length($_) && substr($cdr->dst,0,length($_)) eq $_;
-  }
-
   return "dcontext IN ( $opt{'skip_dcontext'} )"
     if $opt{'skip_dcontext'} =~ /\S/
     && grep { $cdr->dcontext eq $_ } split(/\s*,\s*/, $opt{'skip_dcontext'});