X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport.pm;h=e38eb655c4c352ef6200c2a3d2fe794752fc0697;hb=a93f1e395694983593c65b35427a13d68e46d380;hp=a20820eb62a0277a148f5566c6d4b1608d1bcfeb;hpb=e5b337000b082742fe773363761e26c87e04fff8;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index a20820eb6..e38eb655c 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,9 @@ __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');
 
 #
 # actions
@@ -98,6 +102,15 @@ sub action_result {
   if ($data->{progress}{finished} || $data->{errors}) {
     $self->render('csv_import/_deferred_report', { no_layout => 1 });
   } else {
+    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', { no_layout => 1 });
   }
 }
@@ -128,7 +141,11 @@ 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
@@ -139,7 +156,7 @@ sub action_report {
   $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,
@@ -248,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,
@@ -255,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.'));
 
@@ -279,7 +305,7 @@ sub test_and_import {
 
   my $worker = $self->worker();
 
-  $worker->run;
+  $worker->run(%params);
 
   return if $self->errors;
 
@@ -372,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;
@@ -409,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;
@@ -461,5 +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;