correct taqua toll free handling and hasten cdr import (skip uninteresting records)

[freeside.git] / FS / FS / cdr / taqua.pm

diff --git a/FS/FS/cdr/taqua.pm b/FS/FS/cdr/taqua.pm
index 3052f83..44e2747 100644 (file)
--- a/FS/FS/cdr/taqua.pm
+++ b/FS/FS/cdr/taqua.pm
@@ -13,7 +13,13 @@ use FS::cdr qw(_cdr_date_parser_maker);
   'import_fields' => [  #some of these are kind arbitrary...
 
     #0
-    'cdrtypenum',                         #RecordType
+    #RecordType
+    sub {
+      my($cdr, $field, $conf, $hashref) = @_;
+      $hashref->{skiprow} = 1 unless ($field == 0 && $cdr->disposition == 100);
+      $cdr->cdrtypenum($field);
+    },
+
     sub { my($cdr, $field) = @_; },             #all10#RecordVersion
     sub { my($cdr, $field) = @_; },       #OrigShelfNumber
     sub { my($cdr, $field) = @_; },       #OrigCardNumber
@@ -22,7 +28,16 @@ use FS::cdr qw(_cdr_date_parser_maker);
     'uniqueid',                           #SequenceNumber
     'accountcode',                        #SessionNumber
     'src',                                #CallingPartyNumber
-    'dst',                                #CalledPartyNumber
+    #'dst',                                #CalledPartyNumber
+    #CalledPartyNumber
+    sub {
+      my( $cdr, $field, $conf ) = @_;
+      if ( $cdr->calltypenum == 6 && $cdr->cdrtypenum == 0 ) {
+        $cdr->dst("+$field");
+      } else {
+        $cdr->dst($field);
+      }
+    },
 
     #10
     _cdr_date_parser_maker('startdate'),  #CallArrivalTime
@@ -79,7 +94,7 @@ use FS::cdr qw(_cdr_date_parser_maker);
           return;
         }
       }
-      $cdr->charged_party($field);
+      '';
     },
 
     sub { my($cdr, $field) = @_; },       #SubscriberNumber