CSV-Import Kunden/Lieferanten: Ungültige Zeichen (\r\n) durch Leerzeichen ersetzen

[mfinanz.git] / SL / Controller / CsvImport / Base.pm

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 67ca19185a094b591780cd5fe9ec6363437cd5f1..eb46b26d54f7c29933d6c402652388a3e8931e26 100644 (file)
--- 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
 (
 
 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 {
  '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,
 
   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),
                                  ));
 
                                   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;
 
 
   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;
 
 
   $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 => [ ] });
 
   $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;
 
   my @objects  = $self->csv->get_objects;
 

-  $self->controller->track_progress(4);
+  $self->controller->track_progress(progress => 70);

 
   my @raw_data = @{ $self->csv->get_data };
 
 
   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->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' ) {
 
   $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->fix_field_lengths;
 

-  $self->controller->track_progress(99);
+  $self->controller->track_progress(progress => 100);

 
   $::myconfig{numberformat} = $old_numberformat;
 }
 
   $::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 };
 }
 
   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) = @_;
 
 sub init_cvar_columns {
   my ($self) = @_;
 


@@ -193,8 +196,6 @@ sub check_vc {
 sub handle_cvars {
   my ($self, $entry) = @_;
 
 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',
   my %type_to_column = ( text      => 'text_value',
                          textfield => 'text_value',
                          select    => 'text_value',


@@ -233,13 +234,9 @@ sub init_profile {
     $profile{$col} = $name;
   }
 
     $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 {
 }
 
 sub add_displayable_columns {


@@ -268,8 +265,6 @@ sub setup_displayable_columns {
 sub add_cvar_columns_to_displayable_columns {
   my ($self) = @_;
 
 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 });
   $self->add_displayable_columns(map { { name        => 'cvar_' . $_->name,
                                          description => $::locale->text('#1 (custom variable)', $_->description) } }
                                      @{ $self->all_cvar_configs });


@@ -387,6 +382,8 @@ sub save_objects {
   return unless $data->[0];
   return unless $data->[0]{object};
 
   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;
   my $dbh = $data->[0]{object}->db;
 
   $dbh->begin_work;


@@ -404,7 +401,7 @@ sub save_objects {
   } continue {
     if ($entry_index % 100 == 0) {
       $dbh->commit;
   } 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;
     }
   }
       $dbh->begin_work;
     }
   }


@@ -425,5 +422,21 @@ 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;
+    $::lxdebug->message(0, "field $field value $value ill $illegal_chars");

 
 

+    next unless defined($value) && ($value =~ s/$illegal_chars/ /g);
+
+    $object->$field($value);
+    push @cleaned_fields, $field;
+  }
+
+  return @cleaned_fields;
+}
+
+1;