projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cdr
/
freeside_description_default.pm
diff --git
a/FS/FS/cdr/freeside_description_default.pm
b/FS/FS/cdr/freeside_description_default.pm
index
400c24b
..
679a032
100644
(file)
--- 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,
%info = (
'name' => 'Freeside default with description field as destination',
'weight' => 25,
+ 'type' => 'csv',
'header' => 1,
'import_fields' => [
'charged_party', # Billed number
'header' => 1,
'import_fields' => [
'charged_party', # Billed number
@@
-37,9
+38,9
@@
use FS::cdr;
# Number
sub {
my($cdr, $number) = @_;
# Number
sub {
my($cdr, $number) = @_;
- $number =~ /(\d+)$/
+ $number =~ /(\
+|)(\d+)\s(\
d+)$/
or die "unparsable number: $number"; #maybe we shouldn't die...
or die "unparsable number: $number"; #maybe we shouldn't die...
- $cdr->dst(
$1
);
+ $cdr->dst(
"$1$2$3"
);
},
'description', # Destination (regionname)
},
'description', # Destination (regionname)
@@
-47,7
+48,7
@@
use FS::cdr;
# Duration
sub {
my($cdr, $duration) = @_;
# 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);
or die "unparsable duration: $duration"; #maybe we shouldn't die...
my $sec = $1*60 + $2;
$cdr->duration($sec);