[freeside-commits] freeside/bin cdr.import, 1.2, 1.3 cdr.sftp_and_import, 1.1, 1.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail.420.am:/tmp/cvs-serv27550/bin

Modified Files:
	cdr.import cdr.sftp_and_import 
Log Message:
add troop CDRs, RT#4413

Index: cdr.sftp_and_import
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/cdr.sftp_and_import,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cdr.sftp_and_import	29 Aug 2008 01:09:09 -0000	1.1
+++ cdr.sftp_and_import	2 Jan 2009 22:03:58 -0000	1.2
@@ -61,13 +61,11 @@
 
   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;
 

Index: cdr.import
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/cdr.import,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cdr.import	23 Jun 2008 22:59:15 -0000	1.2
+++ cdr.import	2 Jan 2009 22:03:58 -0000	1.3
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Usage:
-#  cdr.import user format <filename
+#  cdr.import user format filename
 #
 
 use strict;
@@ -14,12 +14,12 @@
 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";
 }