X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FCsvImport.pm;h=ae71123849ad4515a75cd73b060f11d5479dfde3;hb=b167020e55e1fed6e66654f5ae397a91b580a7be;hp=98aed9c37172b86d9e45b778a1f02434e6dc03e0;hpb=b2930e37cd4bfd276be6c785e1cd7fff0f503aef;p=kivitendo-erp.git diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm index 98aed9c37..ae7112384 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; @@ -51,13 +50,12 @@ sub run { $self->{db_obj} = shift; $self->do_import; - - $self->cleanup; } sub do_import { my ($self) = @_; + require SL::Controller::CsvImport; my $c = SL::Controller::CsvImport->new; my $job = $self->{db_obj}; @@ -76,7 +74,7 @@ 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), @@ -84,7 +82,7 @@ sub do_import { $c->add_progress_tracker($self); - $c->test_and_import(test => 1, session_id => $job->data_as_hash->{session_id}); + $c->test_and_import(test => $test, session_id => $job->data_as_hash->{session_id}); if ($c->errors) { $job->set_data( @@ -110,10 +108,6 @@ sub track_progress { $self->{db_obj}->save; } -sub cleanup { - -} - 1; __END__