X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport.pm;h=c509e2108d48ee614327fd9723275dc9430d2eae;hb=5491c513f55dfbfedb13eed88f3fe913cd8d4df6;hp=8834b2024ca455afc5e570ae51688130df285352;hpb=8ae2bc4fb4c72f3ac907a3e47c0cbd5da23f62c5;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm index 8834b2024..c509e2108 100644 --- a/SL/Controller/CsvImport.pm +++ b/SL/Controller/CsvImport.pm @@ -8,6 +8,7 @@ use SL::DB::CsvImportReport; use SL::DB::Unit; use SL::DB::Helper::Paginated (); use SL::Helper::Flash; +use SL::Locale::String; use SL::SessionFile; use SL::Controller::CsvImport::Contact; use SL::Controller::CsvImport::CustomerVendor; @@ -26,7 +27,7 @@ use Rose::Object::MakeMethods::Generic ( scalar => [ qw(type profile file all_profiles all_charsets sep_char all_sep_chars quote_char all_quote_chars escape_char all_escape_chars all_buchungsgruppen all_units import_status errors headers raw_data_headers info_headers data num_imported num_importable displayable_columns file) ], - 'scalar --get_set_init' => [ qw(worker) ], + 'scalar --get_set_init' => [ qw(worker task_server) ], 'array' => [ progress_tracker => { }, add_progress_tracker => { interface => 'add', hash_key => 'progress_tracker' }, @@ -37,6 +38,7 @@ __PACKAGE__->run_before('check_auth'); __PACKAGE__->run_before('ensure_form_structure'); __PACKAGE__->run_before('check_type', except => [ qw(report) ]); __PACKAGE__->run_before('load_all_profiles'); +__PACKAGE__->run_before('check_task_server'); __PACKAGE__->run_after('cleanup_reports'); @@ -98,9 +100,18 @@ sub action_result { } if ($data->{progress}{finished} || $data->{errors}) { - $self->render('csv_import/_deferred_report', { no_layout => 1 }); + $self->render('csv_import/_deferred_report', { layout => 0 }); } else { - $self->render('csv_import/_deferred_results', { no_layout => 1 }); + if (!$self->task_server->is_running) { + $self->task_server->start; + $self->{status_text} = t8('Task Server is not running, starting it now. If this does not change, please check your task server config'); + } elsif (my $phase = $data->{progress}{phase}) { + $self->{status_text} = "$data->{progress}{plan}{$phase} / $data->{progress}{num_phases} " . t8($phase); + } else { + $self->{status_text} = t8('Import not started yet, please wait...'); + } + + $self->render('csv_import/_deferred_results', { layout => 0 }); } } @@ -130,24 +141,28 @@ sub action_report { my $report_id = $params{report_id} || $::form->{id}; $self->{report} = SL::DB::Manager::CsvImportReport->find_by(id => $report_id); - my $num_rows = SL::DB::Manager::CsvImportReportRow->get_all_count(query => [ csv_import_report_id => $report_id ]); + + if (!$self->{report}) { + $::form->error(t8('No report with id #1', $report_id)); + } + my $num_rows = $self->{report}->numrows; my $num_cols = SL::DB::Manager::CsvImportReportRow->get_all_count(query => [ csv_import_report_id => $report_id, row => 0 ]); # manual paginating, yuck my $page = $::form->{page} || 1; my $pages = {}; $pages->{per_page} = $::form->{per_page} || 20; - $pages->{max} = SL::DB::Helper::Paginated::ceil($num_rows / ($num_cols || 1), $pages->{per_page}) || 1; + $pages->{max} = SL::DB::Helper::Paginated::ceil($num_rows, $pages->{per_page}) || 1; $pages->{cur} = $page < 1 ? 1 : $page > $pages->{max} ? $pages->{max} : $page; - $pages->{common} = SL::DB::Helper::Paginated::make_common_pages($pages->{cur}, $pages->{max}); + $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{cur}, $pages->{max}) } ]; $self->{display_rows} = [ 0, $pages->{per_page} * ($pages->{cur}-1) + 1 .. - min($pages->{per_page} * $pages->{cur}, $num_rows / ($num_cols || 1) - 1) + min($pages->{per_page} * $pages->{cur}, $num_rows) ]; my @query = ( @@ -169,7 +184,7 @@ sub action_report { $self->{pages} = $pages; $self->{base_url} = $self->url_for(action => 'report', id => $report_id, no_layout => $params{no_layout} || $::form->{no_layout} ); - $self->render('csv_import/report', { no_layout => $params{no_layout} || $::form->{no_layout} }); + $self->render('csv_import/report', { layout => !($params{no_layout} || $::form->{no_layout}) }); } @@ -250,6 +265,12 @@ sub test_and_import_deferred { $file->fh->close; } + my $file = SL::SessionFile->new($self->csv_file_name, mode => '<', encoding => $self->profile->get('charset')); + if (!$file->fh) { + flash('error', $::locale->text('No file has been uploaded yet.')); + return $self->action_new; + } + $self->{background_job} = SL::BackgroundJob::CsvImport->create_job( file => $self->csv_file_name, profile => $self->profile, @@ -257,8 +278,11 @@ sub test_and_import_deferred { test => $params{test}, )->save; - SL::System::TaskServer->start_if_not_running; - SL::System::TaskServer->wake_up; + if ($self->task_server->is_running) { + $self->task_server->wake_up; + } else { + $self->task_server->start; + } flash('info', $::locale->text('Your import is beig processed.')); @@ -281,7 +305,7 @@ sub test_and_import { my $worker = $self->worker(); - $worker->run; + $worker->run(%params); return if $self->errors; @@ -374,7 +398,10 @@ sub save_report { profile => $clone_profile, type => $self->type, file => '', - )->save(cascade => 1); + numrows => scalar @{ $self->data }, + ); + + $report->save(cascade => 1) or die $report->db->error; my $dbh = $::form->get_standard_dbh; $dbh->begin_work; @@ -389,7 +416,7 @@ sub save_report { my (@headers, @info_methods, @raw_methods, @methods); for my $i (0 .. $#{ $self->info_headers->{headers} }) { - next unless $self->info_headers->{used}->{ $self->info_headers->{headers}->[$i] }; + next unless $self->info_headers->{used}->{ $self->info_headers->{methods}->[$i] }; push @headers, $self->info_headers->{headers}->[$i]; push @info_methods, $self->info_headers->{methods}->[$i]; } @@ -411,7 +438,7 @@ sub save_report { my $o2 = $o1 + @methods; for my $row (0 .. $#{ $self->data }) { - $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 100 == 0; + $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0; my $data_row = $self->{data}[$row]; $sth->execute($report->id, $_, $row + 1, $data_row->{info_data}{ $info_methods[$_] }) for 0 .. $#info_methods; @@ -463,9 +490,20 @@ sub track_progress { } } +sub init_task_server { + SL::System::TaskServer->new; +} sub cleanup_reports { SL::DB::Manager::CsvImportReport->cleanup; } +sub check_task_server { + return 1 if $_[0]->task_server->is_running; + + flash('info', t8('The task server is not running at the moment but needed for this module')); + + 1; +} + 1;