X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/91e4c0dc7b3e89a6301bdbd698c440ce8776f83d..6f266e929ff3eaefc84c34b46fa452c50eecbcf4:/SL/Controller/CsvImport/CustomerVendor.pm

diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm
index e9b2d3931..757c52c5d 100644
--- a/SL/Controller/CsvImport/CustomerVendor.pm
+++ b/SL/Controller/CsvImport/CustomerVendor.pm
@@ -47,10 +47,15 @@ sub init_languages_by {
 sub check_objects {
   my ($self) = @_;
 
+  $self->controller->track_progress(phase => 'building data', progress => 0);
+
   my $numbercolumn  = $self->controller->profile->get('table') . "number";
   my %vcs_by_number = map { ( $_->$numbercolumn => 1 ) } @{ $self->existing_objects };
 
+  my $i;
+  my $num_data = scalar @{ $self->controller->data };
   foreach my $entry (@{ $self->controller->data }) {
+    $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
     my $object = $entry->{object};
 
     $self->check_name($entry);
@@ -66,33 +71,26 @@ sub check_objects {
     } else {
       $vcs_by_number{ $object->$numbercolumn } = $object;
     }
+  } continue {
+    $i++;
   }
 
   $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment));
   $self->add_cvar_raw_data_columns;
 }
 
-sub check_duplicates {
-  my ($self, %params) = @_;
-
-  my $normalizer = sub { my $name = $_[0]; $name =~ s/[\s,\.\-]//g; return $name; };
-
-  my %by_name;
-  if ('check_db' eq $self->controller->profile->get('duplicates')) {
-    %by_name = map { ( $normalizer->($_->name) => 'db' ) } @{ $self->existing_objects };
-  }
-
-  foreach my $entry (@{ $self->controller->data }) {
-    next if @{ $entry->{errors} };
-
-    my $name = $normalizer->($entry->{object}->name);
-    if (!$by_name{$name}) {
-      $by_name{$name} = 'csv';
-
-    } else {
-      push @{ $entry->{errors} }, $by_name{$name} eq 'db' ? $::locale->text('Duplicate in database') : $::locale->text('Duplicate in CSV file');
-    }
-  }
+sub get_duplicate_check_fields {
+  return {
+    name => {
+      label     => $::locale->text('Customer Name'),
+      default   => 1,
+      maker     => sub {
+        my $name = shift->name;
+        $name =~ s/[\s,\.\-]//g;
+        return $name;
+      }
+    },
+  };
 }
 
 sub check_name {