add troop CDRs, RT#4413

2 files changed, 8 insertions, 10 deletions

diff --git a/bin/cdr.import b/bin/cdr.import
index 5c5e6ab63..b2e8d9127 100644
--- a/bin/cdr.import
+++ b/bin/cdr.import
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Usage:
-#  cdr.import user format <filename
+#  cdr.import user format filename
 #
 
 use strict;
@@ -14,12 +14,12 @@ adminsuidsetup $user;
 my $format = shift or die &usage;
 
 my $error = FS::cdr::batch_import( {
-  'filehandle' => *STDIN{IO},
-  'format'     => $format,
+  'file'   => shift,
+  'format' => $format,
 } );
 die $error if $error;
 
 sub usage {
-  "Usage: \n  cdr.import user format <filename\n";
+  "Usage: \n  cdr.import user format filename\n";
 }
 
diff --git a/bin/cdr.sftp_and_import b/bin/cdr.sftp_and_import
index f68d70c76..57d4e871e 100755
--- a/bin/cdr.sftp_and_import
+++ b/bin/cdr.sftp_and_import
@@ -61,13 +61,11 @@ foreach my $file ( @$ls ) {
 
   warn "Processing $filename\n" if $opt_v;
 
-  open(FILE, "$cachedir/$filename") or die "can't read $cachedir/$filename: $!";
-
   my $error = FS::cdr::batch_import( {
-    'filehandle' => *FILE{IO},
-    'format'     => $format,
-    'cdrbatch'   => $filename,
-    'empty_ok'   => 1,
+    'file'     => "$cachedir/$filename"
+    'format'   => $format,
+    'cdrbatch' => $filename,
+    'empty_ok' => 1,
   } );
   die $error if $error;