X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FCsvImport.pm;h=b5e6f2908f2b75ebf6a6d38a8a10af212f2c02f6;hb=50cd4bdaf6e14b7e424b0240bb27f921ce34b8ed;hp=5471addb5bdcb2cec3defaa3689e8b158b5ff038;hpb=d001c791676ec85371465f557cf21e72b09319a4;p=kivitendo-erp.git diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm index 5471addb5..b5e6f2908 100644 --- a/SL/BackgroundJob/CsvImport.pm +++ b/SL/BackgroundJob/CsvImport.pm @@ -5,7 +5,6 @@ use strict; use parent qw(SL::BackgroundJob::Base); use YAML (); -use SL::Controller::CsvImport; use SL::DB::CsvImportProfile; use SL::SessionFile::Random; @@ -56,11 +55,13 @@ sub run { sub do_import { my ($self) = @_; + require SL::Controller::CsvImport; my $c = SL::Controller::CsvImport->new; my $job = $self->{db_obj}; $c->profile($self->profile); $c->type($job->data_as_hash->{type}); + $c->{employee_id} = $job->data_as_hash->{employee_id}; my $test = $job->data_as_hash->{test}; @@ -74,15 +75,16 @@ sub do_import { plan => { 'parsing csv' => 1, 'building data' => 2, - ( 'saving data' => 3, )x!!$test, + ( 'saving data' => 3, )x!$test, 'building report' => ($test ? 3 : 4), }, num_phases => ($test ? 3 : 4), ); $c->add_progress_tracker($self); + my $session_id = $job->data_as_hash->{session_id}; - $c->test_and_import(test => 1, session_id => $job->data_as_hash->{session_id}); + $c->test_and_import(test => $test, session_id => $session_id); if ($c->errors) { $job->set_data( @@ -90,7 +92,7 @@ sub do_import { )->save; } else { - my $report_id = $c->save_report; + my $report_id = $c->save_report(session_id => $session_id); $job->set_data(report_id => $report_id)->save; $c->track_progress(finished => 1);