use strict;
+use English qw(-no_match_vars);
use List::MoreUtils qw(pairwise any);
use SL::Helper::Csv;
$self->controller->raw_data_headers({ used => { }, headers => [ ] });
$self->controller->info_headers({ used => { }, headers => [ ] });
- my @objects = $self->csv->get_objects;
+ my $objects = $self->csv->get_objects;
$self->controller->track_progress(progress => 70);
$self->controller->track_progress(progress => 80);
- $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @objects, @raw_data ]);
+ $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @$objects, @raw_data ]);
$self->controller->track_progress(progress => 90);
my $ret;
if (!eval { $ret = $object->save(cascade => !!$self->save_with_cascade()); 1 }) {
- push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $@);
+ push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $EVAL_ERROR);
} elsif ( !$ret ) {
- push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $entry->{object}->db->error);
+ push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $object->db->error);
} else {
$self->_save_history($object);
$self->controller->num_imported($self->controller->num_imported + 1);