X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FBase.pm;h=17a3bfdd6563341ee76a4137bf90cb59a94ebe02;hb=df71b4750efd8607a7852b25f26a3b121a8ee7a1;hp=656495e3761eee6490e3f96e816b794b4f631977;hpb=5829f39dc57db589b830a4adc4053538ddec0ee5;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm index 656495e37..17a3bfdd6 100644 --- a/SL/Controller/CsvImport/Base.pm +++ b/SL/Controller/CsvImport/Base.pm @@ -2,56 +2,78 @@ package SL::Controller::CsvImport::Base; use strict; -use List::MoreUtils qw(pairwise); +use English qw(-no_match_vars); +use List::Util qw(min); +use List::MoreUtils qw(pairwise any); use SL::Helper::Csv; + +use SL::DB; +use SL::DB::BankAccount; use SL::DB::Customer; use SL::DB::Language; use SL::DB::PaymentTerm; +use SL::DB::DeliveryTerm; use SL::DB::Vendor; use SL::DB::Contact; +use SL::DB::History; use parent qw(Rose::Object); use Rose::Object::MakeMethods::Generic ( - scalar => [ qw(controller file csv 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) ], + 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 delivery_terms_by all_bank_accounts all_vc vc_by clone_methods) ], ); sub run { - my ($self) = @_; + my ($self, %params) = @_; + + $self->test_run($params{test}); + + $self->controller->track_progress(phase => 'parsing csv', progress => 0); my $profile = $self->profile; $self->csv(SL::Helper::Csv->new(file => $self->file->file_name, encoding => $self->controller->profile->get('charset'), - class => $self->class, - profile => $profile, + profile => [{ profile => $profile, class => $self->class, mapping => $self->controller->mappings_for_profile }], ignore_unknown_columns => 1, strict_profile => 1, case_insensitive_header => 1, map { ( $_ => $self->controller->profile->get($_) ) } qw(sep_char escape_char quote_char), )); + $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(progress => 50); + $self->controller->errors([ $self->csv->errors ]) if $self->csv->errors; return if ( !$self->csv->header || $self->csv->errors ); - my $headers = { headers => [ grep { $profile->{$_} } @{ $self->csv->header } ] }; - $headers->{methods} = [ map { $profile->{$_} } @{ $headers->{headers} } ]; - $headers->{used} = { map { ($_ => 1) } @{ $headers->{headers} } }; + my $headers = { headers => [ grep { $self->csv->dispatcher->is_known($_, 0) } @{ $self->csv->header } ] }; + $headers->{methods} = [ map { $_->{path} } @{ $self->csv->specs->[0] } ]; + $headers->{used} = { map { ($_ => 1) } @{ $headers->{headers} } }; $self->controller->headers($headers); $self->controller->raw_data_headers({ used => { }, headers => [ ] }); $self->controller->info_headers({ used => { }, headers => [ ] }); - my @objects = $self->csv->get_objects; + my $objects = $self->csv->get_objects; + + $self->controller->track_progress(progress => 70); + my @raw_data = @{ $self->csv->get_data }; - $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @objects, @raw_data ]); + + $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(progress => 90); $self->check_objects; if ( $self->controller->profile->get('duplicates', 'no_check') ne 'no_check' ) { @@ -60,6 +82,8 @@ sub run { } $self->fix_field_lengths; + $self->controller->track_progress(progress => 100); + $::myconfig{numberformat} = $old_numberformat; } @@ -104,6 +128,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) = @_; @@ -116,6 +145,12 @@ sub init_all_languages { return SL::DB::Manager::Language->get_all; } +sub init_all_bank_accounts { + my ($self) = @_; + + return SL::DB::Manager::BankAccount->get_all_sorted( query => [ obsolete => 0 ] ); +} + sub init_payment_terms_by { my ($self) = @_; @@ -123,6 +158,13 @@ sub init_payment_terms_by { return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_payment_terms } } ) } qw(id description) }; } +sub init_delivery_terms_by { + my ($self) = @_; + + my $all_delivery_terms = SL::DB::Manager::DeliveryTerm->get_all; + return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_delivery_terms } } ) } qw(id description) }; +} + sub init_all_vc { my ($self) = @_; @@ -130,6 +172,14 @@ sub init_all_vc { vendors => SL::DB::Manager::Vendor->get_all }; } +sub init_clone_methods { + {} +} + +sub force_allow_columns { + return (); +} + sub init_vc_by { my ($self) = @_; @@ -152,8 +202,8 @@ sub check_vc { } if (!$entry->{object}->$id_column) { - my $vc = $self->vc_by->{number}->{customers}->{ $entry->{raw_data}->{customernumber} } - || $self->vc_by->{number}->{vendors}->{ $entry->{raw_data}->{vendornumber} }; + my $vc = ($entry->{raw_data}->{customernumber} && $self->vc_by->{number}->{customers}->{ $entry->{raw_data}->{customernumber} }) + || ($entry->{raw_data}->{vendornumber} && $self->vc_by->{number}->{vendors}->{ $entry->{raw_data}->{vendornumber} }); $entry->{object}->$id_column($vc->id) if $vc; } @@ -173,8 +223,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', @@ -184,15 +232,29 @@ sub handle_cvars { bool => 'bool_value' ); my @cvars; + my %changed_cvars; foreach my $config (@{ $self->all_cvar_configs }) { next unless exists $entry->{raw_data}->{ "cvar_" . $config->name }; my $value = $entry->{raw_data}->{ "cvar_" . $config->name }; my $column = $type_to_column{ $config->type } || die "Program logic error: unknown custom variable storage type"; - push @cvars, SL::DB::CustomVariable->new(config_id => $config->id, $column => $value, sub_module => ''); + my $new_cvar = SL::DB::CustomVariable->new(config_id => $config->id, $column => $value, sub_module => ''); + + push @cvars, $new_cvar; + $changed_cvars{$config->name} = $new_cvar; } - $entry->{object}->custom_variables(\@cvars); + # merge existing with new cvars. swap every existing with the imported one, push the rest + if (@cvars) { + my @orig_cvars = ($entry->{object_to_save} || $entry->{object})->custom_variables; + for (@orig_cvars) { + $_ = $changed_cvars{ $_->config->name } if $changed_cvars{ $_->config->name }; + delete $changed_cvars{ $_->config->name }; + } + push @orig_cvars, values %changed_cvars; + + $entry->{object}->custom_variables(\@orig_cvars); + } } sub init_profile { @@ -201,6 +263,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}; @@ -213,13 +277,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 { @@ -248,8 +308,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 }); @@ -273,6 +331,8 @@ sub init_manager_class { $self->manager_class("SL::DB::Manager::" . $1); } +sub is_multiplexed { 0 } + sub check_objects { } @@ -354,6 +414,38 @@ sub check_payment { } $object->payment_id($terms->id); + + # register payment_id for method copying later + $self->clone_methods->{payment_id} = 1; + } + + return 1; +} + +sub check_delivery_term { + my ($self, $entry) = @_; + + my $object = $entry->{object}; + + # Check whether or not delivery term ID is valid. + if ($object->delivery_term_id && !$self->delivery_terms_by->{id}->{ $object->delivery_term_id }) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid delivery terms'); + return 0; + } + + # Map name to ID if given. + if (!$object->delivery_term_id && $entry->{raw_data}->{delivery_term}) { + my $terms = $self->delivery_terms_by->{description}->{ $entry->{raw_data}->{delivery_term} }; + + if (!$terms) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid delivery terms'); + return 0; + } + + $object->delivery_term_id($terms->id); + + # register delivery_term_id for method copying later + $self->clone_methods->{delivery_term_id} = 1; } return 1; @@ -364,21 +456,45 @@ sub save_objects { my $data = $params{data} || $self->controller->data; - foreach my $entry (@{ $data }) { - next if @{ $entry->{errors} }; + return unless $data->[0]; + return unless $data->[0]{object}; - my $object = $entry->{object_to_save} || $entry->{object}; + $self->controller->track_progress(phase => 'saving data', progress => 0); # scale from 45..95%; - if ( !$object->save(cascade => !!$self->save_with_cascade()) ) { - push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $entry->{object}->db->error); - } else { - $self->controller->num_imported($self->controller->num_imported + 1); - } + my $dbh = $data->[0]{object}->db->dbh; + + my $last_index = $#$data; + my $chunk_size = 100; # one transaction and progress update every 100 objects + + for my $chunk (0 .. $last_index / $chunk_size) { + $self->controller->track_progress(progress => ($chunk_size * $chunk)/scalar(@$data) * 100); # scale from 45..95%; + SL::DB->client->with_transaction(sub { + foreach my $entry_index ($chunk_size * $chunk .. min( $last_index, $chunk_size * ($chunk + 1) - 1 )) { + my $entry = $data->[$entry_index]; + next if @{ $entry->{errors} }; + + my $object = $entry->{object_to_save} || $entry->{object}; + + my $ret; + if (!eval { $ret = $object->save(cascade => !!$self->save_with_cascade()); 1 }) { + push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $EVAL_ERROR); + } elsif ( !$ret ) { + push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $object->db->error); + } else { + $self->_save_history($object); + $self->controller->num_imported($self->controller->num_imported + 1); + } + } + 1; + }) or do { die SL::DB->client->error }; } + $self->controller->track_progress(progress => 100); } sub field_lengths { - return (); + my ($self) = @_; + + return map { $_->name => $_->length } grep { $_->type eq 'varchar' } @{$self->class->meta->columns}; } sub fix_field_lengths { @@ -391,5 +507,44 @@ 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; +} + +sub _save_history { + my ($self, $object) = @_; + + if (any { $self->controller->{type} && $_ eq $self->controller->{type} } qw(parts customers_vendors orders ar_transactions)) { + my $snumbers = $self->controller->{type} eq 'parts' ? 'partnumber_' . $object->partnumber + : $self->controller->{type} eq 'customers_vendors' ? + ($self->table eq 'customer' ? 'customernumber_' . $object->customernumber : 'vendornumber_' . $object->vendornumber) + : $self->controller->{type} eq 'orders' ? 'ordnumber_' . $object->ordnumber + : $self->controller->{type} eq 'ar_transactions' ? 'invnumber_' . $object->invnumber + : ''; + + my $what_done = $self->controller->{type} eq 'orders' ? 'sales_order' + : ''; + + SL::DB::History->new( + trans_id => $object->id, + snumbers => $snumbers, + employee_id => $self->controller->{employee_id}, + addition => 'SAVED', + what_done => $what_done, + )->save(); + } +} + +1;