[freeside-commits] freeside/bin cdr.http_and_import, 1.1, 1.2 cdr.import, 1.4, 1.5 cdr-transnexus.import, 1.3, 1.4

[Ivan,,,]

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

Modified Files:
	cdr.http_and_import cdr.import cdr-transnexus.import 
Log Message:
proper cdr_batch table, RT#6386

Index: cdr.http_and_import
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/cdr.http_and_import,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cdr.http_and_import	3 Jan 2009 01:52:58 -0000	1.1
+++ cdr.http_and_import	19 Nov 2009 09:47:02 -0000	1.2
@@ -85,10 +85,10 @@
   warn "Processing $filename\n" if $opt_v;
 
   my $error = FS::cdr::batch_import( {
-    'file'     => "$cachedir/$filename",
-    'format'   => $format,
-    'params'   => { 'cdrbatch' => $filename },
-    'empty_ok' => 1,
+    'file'            => "$cachedir/$filename",
+    'format'          => $format,
+    'batch_namevalue' => $filename,
+    'empty_ok'        => 1,
   } );
   die $error if $error;
 

Index: cdr-transnexus.import
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/cdr-transnexus.import,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cdr-transnexus.import	31 Jul 2009 07:58:04 -0000	1.3
+++ cdr-transnexus.import	19 Nov 2009 09:47:02 -0000	1.4
@@ -66,10 +66,10 @@
     warn "Processing $filename\n" if $opt_v;
 
     my $error = FS::cdr::batch_import( {
-      'file'     => "$cachedir/$filename",
-      'format'   => $format,
-      'params'   => { 'cdrbatch' => $filename, },
-      'empty_ok' => 1,
+      'file'            => "$cachedir/$filename",
+      'format'          => $format,
+      'batch_namevalue' => $filename,
+      'empty_ok'        => 1,
     } );
     die $error if $error;
 

Index: cdr.import
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/cdr.import,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cdr.import	3 Jan 2009 01:52:58 -0000	1.4
+++ cdr.import	19 Nov 2009 09:47:02 -0000	1.5
@@ -16,9 +16,9 @@
 my $file = shift;
 
 my $error = FS::cdr::batch_import( {
-  'file'   => $file,
-  'format' => $format,
-  'params' => { 'cdrbatch' => $file },
+  'file'            => $file,
+  'format'          => $format,
+  'batch_namevalue' => $file,
 } );
 die $error if $error;