X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Ffreeside_description_default.pm;h=679a032294d4e2e17717beb482ba3371be7c6477;hb=b86687a90410fb7147c172b0a2f8581fb1b9e64e;hp=400c24b82a030646c513eba997935b0ee5a6ffb5;hpb=0db33c9c112e7944fd022a423453aee48d9503b4;p=freeside.git

diff --git a/FS/FS/cdr/freeside_description_default.pm b/FS/FS/cdr/freeside_description_default.pm
index 400c24b82..679a03229 100644
--- a/FS/FS/cdr/freeside_description_default.pm
+++ b/FS/FS/cdr/freeside_description_default.pm
@@ -10,6 +10,7 @@ use FS::cdr;
 %info = (
   'name'          => 'Freeside default with description field as destination',
   'weight'        => 25,
+  'type'          => 'csv',
   'header'        => 1,
   'import_fields' => [
     'charged_party',     # Billed number
@@ -37,9 +38,9 @@ use FS::cdr;
     # Number
     sub {
         my($cdr, $number) = @_;
-        $number =~ /(\d+)$/ 
+        $number =~ /(\+|)(\d+)\s(\d+)$/ 
             or die "unparsable number: $number"; #maybe we shouldn't die...
-        $cdr->dst($1);
+        $cdr->dst("$1$2$3");
     },           
 
     'description',      # Destination (regionname)
@@ -47,7 +48,7 @@ use FS::cdr;
     # Duration
     sub {
         my($cdr, $duration) = @_;
-        $duration =~ /^(\d{1,2})m (\d{1,2})s$/
+        $duration =~ /^(\d{1,3})m (\d{1,2})s$/
             or die "unparsable duration: $duration"; #maybe we shouldn't die...
         my $sec = $1*60 + $2;
         $cdr->duration($sec);