X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FCsvImport.pm;h=18cf7cf0d375f0fc09b81be124cef239dc788d17;hb=1264cff68a2e27855c34fc2e00e1f6724ab004f4;hp=66d830f9059846279ba904bbee132da0d64a6f33;hpb=98f37c1019ea0e80d5a45a5633a0a182a43cbf9a;p=kivitendo-erp.git diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm index 66d830f90..18cf7cf0d 100644 --- a/SL/BackgroundJob/CsvImport.pm +++ b/SL/BackgroundJob/CsvImport.pm @@ -51,8 +51,6 @@ sub run { $self->{db_obj} = shift; $self->do_import; - - $self->cleanup; } sub do_import { @@ -66,12 +64,17 @@ sub do_import { my $test = $job->data_as_hash->{test}; + + # $::locale->text('parsing csv') + # $::locale->text('building data') + # $::locale->text('saving data') + # $::locale->text('building report') $self->track_progress( progress => 0, 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), @@ -79,12 +82,11 @@ 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( errors => $c->errors, - progress => -1, )->save; } else { @@ -106,10 +108,6 @@ sub track_progress { $self->{db_obj}->save; } -sub cleanup { - -} - 1; __END__