From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 May 2013 21:26:06 +0000 (-0700)
Subject: add -s flag to skip CDR files that error out, RT#20763
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=53587d38364bb25653f7df08b2cf1a7468d43c1f;hp=2272361a3302113bb43cbf4581e7187db25f3a58;p=freeside.git

add -s flag to skip CDR files that error out, RT#20763
---

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index bdf3bcf3a..87947f085 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1697,7 +1697,7 @@ sub batch_import {
 
     my $data = slurp($file);
     my $asn_output = $parser->decode( $data )
-      or die "No ". $asn_format->{'macro'}. " found\n";
+      or return "No ". $asn_format->{'macro'}. " found\n";
 
     $asn_header_buffer = &{ $asn_format->{'header_buffer'} }( $asn_output );
 
@@ -1881,7 +1881,7 @@ sub batch_import {
     return "Empty file!";
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;;
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   ''; #no error