projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add -s flag to skip CDR files that error out, RT#20763
[freeside.git]
/
FS
/
FS
/
Record.pm
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
bdf3bcf
..
87947f0
100644
(file)
--- 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 )
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 );
$asn_header_buffer = &{ $asn_format->{'header_buffer'} }( $asn_output );
@@
-1881,7
+1881,7
@@
sub batch_import {
return "Empty file!";
}
return "Empty file!";
}
- $dbh->commit or die $dbh->errstr if $oldAutoCommit;
;
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
''; #no error
''; #no error