X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FBase.pm;h=7f4326a07141f644e0821f6aba5d72aae1f29036;hb=be776964b83340e69fa2f02eae59b703c0c95b88;hp=67ca19185a094b591780cd5fe9ec6363437cd5f1;hpb=d74921657d967900bded4aaf4805647e9cf83562;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 67ca19185..7f4326a07 100644
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -15,14 +15,16 @@ use parent qw(Rose::Object);
 
 use Rose::Object::MakeMethods::Generic
 (
- scalar                  => [ qw(controller file csv save_with_cascade) ],
+ scalar                  => [ qw(controller file csv test_run save_with_cascade) ],
  'scalar --get_set_init' => [ qw(profile displayable_columns existing_objects class manager_class cvar_columns all_cvar_configs all_languages payment_terms_by all_vc vc_by) ],
 );
 
 sub run {
-  my ($self) = @_;
+  my ($self, %params) = @_;
+
+  $self->test_run($params{test_run});
 
-  $self->controller->track_progress(0);
+  $self->controller->track_progress(phase => 'parsing csv', progress => 0);
 
   my $profile = $self->profile;
   $self->csv(SL::Helper::Csv->new(file                   => $self->file->file_name,
@@ -35,14 +37,14 @@ sub run {
                                   map { ( $_ => $self->controller->profile->get($_) ) } qw(sep_char escape_char quote_char),
                                  ));
 
-  $self->controller->track_progress(1);
+  $self->controller->track_progress(progress => 10);
 
   my $old_numberformat      = $::myconfig{numberformat};
   $::myconfig{numberformat} = $self->controller->profile->get('numberformat');
 
   $self->csv->parse;
 
-  $self->controller->track_progress(3);
+  $self->controller->track_progress(progress => 50);
 
   $self->controller->errors([ $self->csv->errors ]) if $self->csv->errors;
 
@@ -55,21 +57,17 @@ sub run {
   $self->controller->raw_data_headers({ used => { }, headers => [ ] });
   $self->controller->info_headers({ used => { }, headers => [ ] });
 
-  $::lxdebug->dump(0,  "self", $self->controller->info_headers);
-  $::lxdebug->dump(0,  "self", $self->controller->headers);
-  $::lxdebug->dump(0,  "self", $self->controller->raw_data_headers);
-
   my @objects  = $self->csv->get_objects;
 
-  $self->controller->track_progress(4);
+  $self->controller->track_progress(progress => 70);
 
   my @raw_data = @{ $self->csv->get_data };
 
-  $self->controller->track_progress(4.5);
+  $self->controller->track_progress(progress => 80);
 
   $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @objects, @raw_data ]);
 
-  $self->controller->track_progress(5);
+  $self->controller->track_progress(progress => 90);
 
   $self->check_objects;
   if ( $self->controller->profile->get('duplicates', 'no_check') ne 'no_check' ) {
@@ -78,7 +76,7 @@ sub run {
   }
   $self->fix_field_lengths;
 
-  $self->controller->track_progress(99);
+  $self->controller->track_progress(progress => 100);
 
   $::myconfig{numberformat} = $old_numberformat;
 }
@@ -124,6 +122,11 @@ sub add_cvar_raw_data_columns {
   map { $self->add_raw_data_columns($_) if exists $self->controller->data->[0]->{raw_data}->{$_} } @{ $self->cvar_columns };
 }
 
+sub init_all_cvar_configs {
+  # Must be overridden by derived specialized importer classes.
+  return [];
+}
+
 sub init_cvar_columns {
   my ($self) = @_;
 
@@ -150,6 +153,10 @@ sub init_all_vc {
            vendors   => SL::DB::Manager::Vendor->get_all };
 }
 
+sub force_allow_columns {
+  return ();
+}
+
 sub init_vc_by {
   my ($self)    = @_;
 
@@ -193,8 +200,6 @@ sub check_vc {
 sub handle_cvars {
   my ($self, $entry) = @_;
 
-  return unless $self->can('all_cvar_configs');
-
   my %type_to_column = ( text      => 'text_value',
                          textfield => 'text_value',
                          select    => 'text_value',
@@ -221,6 +226,8 @@ sub init_profile {
   eval "require " . $self->class;
 
   my %unwanted = map { ( $_ => 1 ) } (qw(itime mtime), map { $_->name } @{ $self->class->meta->primary_key_columns });
+  delete $unwanted{$_} for ($self->force_allow_columns);
+
   my %profile;
   for my $col ($self->class->meta->columns) {
     next if $unwanted{$col};
@@ -233,13 +240,9 @@ sub init_profile {
     $profile{$col} = $name;
   }
 
-  if ($self->can('all_cvar_configs')) {
-    for (@{ $self->all_cvar_configs }) {
-      $profile{ 'cvar_' . $_->name } = '';
-    }
-  }
+  $profile{ 'cvar_' . $_->name } = '' for @{ $self->all_cvar_configs };
 
-  $self->profile(\%profile);
+  \%profile;
 }
 
 sub add_displayable_columns {
@@ -268,8 +271,6 @@ sub setup_displayable_columns {
 sub add_cvar_columns_to_displayable_columns {
   my ($self) = @_;
 
-  return unless $self->can('all_cvar_configs');
-
   $self->add_displayable_columns(map { { name        => 'cvar_' . $_->name,
                                          description => $::locale->text('#1 (custom variable)', $_->description) } }
                                      @{ $self->all_cvar_configs });
@@ -387,6 +388,8 @@ sub save_objects {
   return unless $data->[0];
   return unless $data->[0]{object};
 
+  $self->controller->track_progress(phase => 'saving data', progress => 0); # scale from 45..95%;
+
   my $dbh = $data->[0]{object}->db;
 
   $dbh->begin_work;
@@ -404,7 +407,7 @@ sub save_objects {
   } continue {
     if ($entry_index % 100 == 0) {
       $dbh->commit;
-      $self->controller->track_progress(45 + $entry_index/scalar(@$data) * 50); # scale from 45..95%;
+      $self->controller->track_progress(progress => $entry_index/scalar(@$data) * 100); # scale from 45..95%;
       $dbh->begin_work;
     }
   }
@@ -425,5 +428,20 @@ sub fix_field_lengths {
   }
 }
 
-1;
+sub clean_fields {
+  my ($self, $illegal_chars, $object, @fields) = @_;
+
+  my @cleaned_fields;
+  foreach my $field (grep { $object->can($_) } @fields) {
+    my $value = $object->$field;
+
+    next unless defined($value) && ($value =~ s/$illegal_chars/ /g);
 
+    $object->$field($value);
+    push @cleaned_fields, $field;
+  }
+
+  return @cleaned_fields;
+}
+
+1;