use strict;
+use SL::DB;
use SL::DB::Buchungsgruppe;
use SL::DB::CsvImportProfile;
use SL::DB::CsvImportReport;
use SL::DB::Unit;
use SL::DB::Helper::Paginated ();
+use SL::DBUtils qw(do_statement);
use SL::Helper::Flash;
use SL::Locale::String;
use SL::SessionFile;
],
);
-__PACKAGE__->run_before('check_auth');
+__PACKAGE__->run_before('check_auth', except => [ qw(report) ]);
__PACKAGE__->run_before('ensure_form_structure');
__PACKAGE__->run_before('check_type', except => [ qw(report) ]);
__PACKAGE__->run_before('load_all_profiles');
my $data = $self->{background_job}->data_as_hash;
my $profile = SL::DB::Manager::CsvImportProfile->find_by(id => $data->{profile_id});
-
$self->profile($profile);
if ($data->{errors} and my $first_error = $data->{errors}->[0]) {
sub action_report {
my ($self, %params) = @_;
- my $report_id = $params{report_id} || $::form->{id};
-
- $self->{report} = SL::DB::Manager::CsvImportReport->find_by(id => $report_id);
+ my $report_id = $params{report_id} || $::form->{id};
+ $self->{report} = SL::DB::Manager::CsvImportReport->find_by(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 ]);
+
+ my $num_rows = $self->{report}->numrows;
# manual paginating, yuck
- my $page = $::form->{page} || 1;
- my $pages = {};
- $pages->{per_page} = $::form->{per_page} || 20;
- $pages->{max} = SL::DB::Helper::Paginated::ceil($num_rows, $pages->{per_page}) || 1;
- $pages->{page} = $page < 1 ? 1
- : $page > $pages->{max} ? $pages->{max}
- : $page;
- $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{page}, $pages->{max}) } ];
+ my $page = $::form->{page} || 1;
+ my $pages = {};
+ $pages->{per_page} = $::form->{per_page} || 20;
+ $pages->{max} = SL::DB::Helper::Paginated::ceil($num_rows, $pages->{per_page}) || 1;
+ $pages->{page} = $page < 1 ? 1
+ : $page > $pages->{max} ? $pages->{max}
+ : $ page;
+ $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{page}, $pages->{max}) } ];
$self->{report_numheaders} = $self->{report}->numheaders;
- my $first_row_header = 0;
- my $last_row_header = $self->{report_numheaders} - 1;
- my $first_row_data = $pages->{per_page} * ($pages->{page}-1) + $self->{report_numheaders};
- my $last_row_data = min($pages->{per_page} * $pages->{page}, $num_rows) + $self->{report_numheaders} - 1;
- $self->{display_rows} = [
+ my $first_row_header = 0;
+ my $last_row_header = $self->{report_numheaders} - 1;
+ my $first_row_data = $pages->{per_page} * ($pages->{page}-1) + $self->{report_numheaders};
+ my $last_row_data = min($pages->{per_page} * $pages->{page}, $num_rows) + $self->{report_numheaders} - 1;
+ $self->{display_rows} = [
$first_row_header
..
$last_row_header,
]
);
- my $rows = SL::DB::Manager::CsvImportReportRow->get_all(query => \@query);
- my $status = SL::DB::Manager::CsvImportReportStatus->get_all(query => \@query);
+ my $rows = SL::DB::Manager::CsvImportReportRow ->get_all(query => \@query);
+ my $status = SL::DB::Manager::CsvImportReportStatus->get_all(query => \@query);
$self->{report_rows} = $self->{report}->folded_rows(rows => $rows);
$self->{report_status} = $self->{report}->folded_status(status => $status);
- $self->{pages} = $pages;
- $self->{base_url} = $self->url_for(action => 'report', id => $report_id, no_layout => $params{no_layout} || $::form->{no_layout} );
+ $self->{pages} = $pages;
+ $self->{base_url} = $self->url_for(action => 'report', id => $report_id, no_layout => $params{no_layout} || $::form->{no_layout} );
$self->render('csv_import/report', { layout => !($params{no_layout} || $::form->{no_layout}) });
}
#
sub check_auth {
- $::auth->assert('config');
+ $_[0]->check_type;
+ $_[0]->worker->check_auth;
}
sub check_type {
my $profile;
if ($::form->{profile}->{id}) {
- $profile = SL::DB::Manager::CsvImportProfile->find_by(id => $::form->{profile}->{id}, login => $::myconfig{login});
+ $profile = SL::DB::Manager::CsvImportProfile->find_by(id => $::form->{profile}->{id});
}
$profile ||= SL::DB::Manager::CsvImportProfile->find_by(type => $self->{type}, is_default => 1, login => $::myconfig{login});
$profile ||= SL::DB::CsvImportProfile->new(type => $self->{type}, login => $::myconfig{login});
file => '',
numrows => scalar @{ $self->data },
numheaders => 1,
+ test_mode => $params{test} ? 1 : 0,
);
$report->save(cascade => 1) or die $report->db->error;
- my $dbh = $::form->get_standard_dbh;
- $dbh->begin_work;
-
- my $query = 'INSERT INTO csv_import_report_rows (csv_import_report_id, col, row, value) VALUES (?, ?, ?, ?)';
- my $query2 = 'INSERT INTO csv_import_report_status (csv_import_report_id, row, type, value) VALUES (?, ?, ?, ?)';
+ SL::DB->client->with_transaction(sub {
+ my $dbh = SL::DB->client->dbh;
- my $sth = $dbh->prepare($query);
- my $sth2 = $dbh->prepare($query2);
+ my $query = 'INSERT INTO csv_import_report_rows (csv_import_report_id, col, row, value) VALUES (?, ?, ?, ?)';
+ my $query2 = 'INSERT INTO csv_import_report_status (csv_import_report_id, row, type, value) VALUES (?, ?, ?, ?)';
- # save headers
- my (@headers, @info_methods, @raw_methods, @methods);
+ my $sth = $dbh->prepare($query);
+ my $sth2 = $dbh->prepare($query2);
- for my $i (0 .. $#{ $self->info_headers->{headers} }) {
- next unless $self->info_headers->{used}->{ $self->info_headers->{methods}->[$i] };
- push @headers, $self->info_headers->{headers}->[$i];
- push @info_methods, $self->info_headers->{methods}->[$i];
- }
- for my $i (0 .. $#{ $self->headers->{headers} }) {
- next unless $self->headers->{used}->{ $self->headers->{headers}->[$i] };
- push @headers, $self->headers->{headers}->[$i];
- push @methods, $self->headers->{methods}->[$i];
- }
- for my $i (0 .. $#{ $self->raw_data_headers->{headers} }) {
- next unless $self->raw_data_headers->{used}->{ $self->raw_data_headers->{headers}->[$i] };
- push @headers, $self->raw_data_headers->{headers}->[$i];
- push @raw_methods, $self->raw_data_headers->{headers}->[$i];
- }
+ # save headers
+ my (@headers, @info_methods, @raw_methods, @methods);
- $sth->execute($report->id, $_, 0, $headers[$_]) for 0 .. $#headers;
+ for my $i (0 .. $#{ $self->info_headers->{headers} }) {
+ next unless $self->info_headers->{used}->{ $self->info_headers->{methods}->[$i] };
+ push @headers, $self->info_headers->{headers}->[$i];
+ push @info_methods, $self->info_headers->{methods}->[$i];
+ }
+ for my $i (0 .. $#{ $self->headers->{headers} }) {
+ next unless $self->headers->{used}->{ $self->headers->{headers}->[$i] };
+ push @headers, $self->headers->{headers}->[$i];
+ push @methods, $self->headers->{methods}->[$i];
+ }
+ for my $i (0 .. $#{ $self->raw_data_headers->{headers} }) {
+ next unless $self->raw_data_headers->{used}->{ $self->raw_data_headers->{headers}->[$i] };
+ push @headers, $self->raw_data_headers->{headers}->[$i];
+ push @raw_methods, $self->raw_data_headers->{headers}->[$i];
+ }
- # col offsets
- my $o1 = @info_methods;
- my $o2 = $o1 + @methods;
+ do_statement($::form, $sth, $query, $report->id, $_, 0, $headers[$_]) for 0 .. $#headers;
- for my $row (0 .. $#{ $self->data }) {
- $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0;
- my $data_row = $self->{data}[$row];
+ # col offsets
+ my $o1 = @info_methods;
+ my $o2 = $o1 + @methods;
- $sth->execute($report->id, $_, $row + 1, $data_row->{info_data}{ $info_methods[$_] }) for 0 .. $#info_methods;
- $sth->execute($report->id, $o1 + $_, $row + 1, $data_row->{object}->${ \ $methods[$_] }) for 0 .. $#methods;
- $sth->execute($report->id, $o2 + $_, $row + 1, $data_row->{raw_data}{ $raw_methods[$_] }) for 0 .. $#raw_methods;
+ for my $row (0 .. $#{ $self->data }) {
+ $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0;
+ my $data_row = $self->{data}[$row];
- $sth2->execute($report->id, $row + 1, 'information', $_) for @{ $data_row->{information} || [] };
- $sth2->execute($report->id, $row + 1, 'errors', $_) for @{ $data_row->{errors} || [] };
- }
+ do_statement($::form, $sth, $query, $report->id, $_, $row + 1, $data_row->{info_data}{ $info_methods[$_] }) for 0 .. $#info_methods;
+ do_statement($::form, $sth, $query, $report->id, $o1 + $_, $row + 1, $data_row->{object}->${ \ $methods[$_] }) for 0 .. $#methods;
+ do_statement($::form, $sth, $query, $report->id, $o2 + $_, $row + 1, $data_row->{raw_data}{ $raw_methods[$_] }) for 0 .. $#raw_methods;
- $dbh->commit;
+ do_statement($::form, $sth2, $query2, $report->id, $row + 1, 'information', $_) for @{ $data_row->{information} || [] };
+ do_statement($::form, $sth2, $query2, $report->id, $row + 1, 'errors', $_) for @{ $data_row->{errors} || [] };
+ }
+ 1;
+ }) or do { die SL::DB->client->error };
return $report->id;
}
file => '',
numrows => scalar @{ $self->data },
numheaders => scalar @{ $self->worker->profile },
+ test_mode => $params{test} ? 1 : 0,
);
$report->save(cascade => 1) or die $report->db->error;
- my $dbh = $::form->get_standard_dbh;
- $dbh->begin_work;
+ SL::DB->client->with_transaction(sub {
+ my $dbh = SL::DB->client->dbh;
- my $query = 'INSERT INTO csv_import_report_rows (csv_import_report_id, col, row, value) VALUES (?, ?, ?, ?)';
- my $query2 = 'INSERT INTO csv_import_report_status (csv_import_report_id, row, type, value) VALUES (?, ?, ?, ?)';
+ my $query = 'INSERT INTO csv_import_report_rows (csv_import_report_id, col, row, value) VALUES (?, ?, ?, ?)';
+ my $query2 = 'INSERT INTO csv_import_report_status (csv_import_report_id, row, type, value) VALUES (?, ?, ?, ?)';
- my $sth = $dbh->prepare($query);
- my $sth2 = $dbh->prepare($query2);
+ my $sth = $dbh->prepare($query);
+ my $sth2 = $dbh->prepare($query2);
- # save headers
- my ($headers, $info_methods, $raw_methods, $methods);
+ # save headers
+ my ($headers, $info_methods, $raw_methods, $methods);
- for my $i (0 .. $#{ $self->worker->profile }) {
- my $row_ident = $self->worker->profile->[$i]->{row_ident};
+ for my $i (0 .. $#{ $self->worker->profile }) {
+ my $row_ident = $self->worker->profile->[$i]->{row_ident};
- for my $i (0 .. $#{ $self->info_headers->{$row_ident}->{headers} }) {
- next unless $self->info_headers->{$row_ident}->{used}->{ $self->info_headers->{$row_ident}->{methods}->[$i] };
- push @{ $headers->{$row_ident} }, $self->info_headers->{$row_ident}->{headers}->[$i];
- push @{ $info_methods->{$row_ident} }, $self->info_headers->{$row_ident}->{methods}->[$i];
- }
- for my $i (0 .. $#{ $self->headers->{$row_ident}->{headers} }) {
- next unless $self->headers->{$row_ident}->{used}->{ $self->headers->{$row_ident}->{headers}->[$i] };
- push @{ $headers->{$row_ident} }, $self->headers->{$row_ident}->{headers}->[$i];
- push @{ $methods->{$row_ident} }, $self->headers->{$row_ident}->{methods}->[$i];
- }
-
- for my $i (0 .. $#{ $self->raw_data_headers->{$row_ident}->{headers} }) {
- next unless $self->raw_data_headers->{$row_ident}->{used}->{ $self->raw_data_headers->{$row_ident}->{headers}->[$i] };
- push @{ $headers->{$row_ident} }, $self->raw_data_headers->{$row_ident}->{headers}->[$i];
- push @{ $raw_methods->{$row_ident} }, $self->raw_data_headers->{$row_ident}->{headers}->[$i];
- }
+ for my $i (0 .. $#{ $self->info_headers->{$row_ident}->{headers} }) {
+ next unless $self->info_headers->{$row_ident}->{used}->{ $self->info_headers->{$row_ident}->{methods}->[$i] };
+ push @{ $headers->{$row_ident} }, $self->info_headers->{$row_ident}->{headers}->[$i];
+ push @{ $info_methods->{$row_ident} }, $self->info_headers->{$row_ident}->{methods}->[$i];
+ }
+ for my $i (0 .. $#{ $self->headers->{$row_ident}->{headers} }) {
+ next unless $self->headers->{$row_ident}->{used}->{ $self->headers->{$row_ident}->{headers}->[$i] };
+ push @{ $headers->{$row_ident} }, $self->headers->{$row_ident}->{headers}->[$i];
+ push @{ $methods->{$row_ident} }, $self->headers->{$row_ident}->{methods}->[$i];
+ }
- }
+ for my $i (0 .. $#{ $self->raw_data_headers->{$row_ident}->{headers} }) {
+ next unless $self->raw_data_headers->{$row_ident}->{used}->{ $self->raw_data_headers->{$row_ident}->{headers}->[$i] };
+ push @{ $headers->{$row_ident} }, $self->raw_data_headers->{$row_ident}->{headers}->[$i];
+ push @{ $raw_methods->{$row_ident} }, $self->raw_data_headers->{$row_ident}->{headers}->[$i];
+ }
- for my $i (0 .. $#{ $self->worker->profile }) {
- my $row_ident = $self->worker->profile->[$i]->{row_ident};
- $sth->execute($report->id, $_, $i, $headers->{$row_ident}->[$_]) for 0 .. $#{ $headers->{$row_ident} };
- }
+ }
- # col offsets
- my ($off1, $off2);
- for my $i (0 .. $#{ $self->worker->profile }) {
- my $row_ident = $self->worker->profile->[$i]->{row_ident};
- my $n_info_methods = $info_methods->{$row_ident} ? scalar @{ $info_methods->{$row_ident} } : 0;
- my $n_methods = $methods->{$row_ident} ? scalar @{ $methods->{$row_ident} } : 0;
+ for my $i (0 .. $#{ $self->worker->profile }) {
+ my $row_ident = $self->worker->profile->[$i]->{row_ident};
+ do_statement($::form, $sth, $query, $report->id, $_, $i, $headers->{$row_ident}->[$_]) for 0 .. $#{ $headers->{$row_ident} };
+ }
- $off1->{$row_ident} = $n_info_methods;
- $off2->{$row_ident} = $off1->{$row_ident} + $n_methods;
- }
+ # col offsets
+ my ($off1, $off2);
+ for my $i (0 .. $#{ $self->worker->profile }) {
+ my $row_ident = $self->worker->profile->[$i]->{row_ident};
+ my $n_info_methods = $info_methods->{$row_ident} ? scalar @{ $info_methods->{$row_ident} } : 0;
+ my $n_methods = $methods->{$row_ident} ? scalar @{ $methods->{$row_ident} } : 0;
- my $n_header_rows = scalar @{ $self->worker->profile };
+ $off1->{$row_ident} = $n_info_methods;
+ $off2->{$row_ident} = $off1->{$row_ident} + $n_methods;
+ }
- for my $row (0 .. $#{ $self->data }) {
- $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0;
- my $data_row = $self->{data}[$row];
- my $row_ident = $data_row->{raw_data}{datatype};
+ my $n_header_rows = scalar @{ $self->worker->profile };
- my $o1 = $off1->{$row_ident};
- my $o2 = $off2->{$row_ident};
+ for my $row (0 .. $#{ $self->data }) {
+ $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0;
+ my $data_row = $self->{data}[$row];
+ my $row_ident = $data_row->{raw_data}{datatype};
- $sth->execute($report->id, $_, $row + $n_header_rows, $data_row->{info_data}{ $info_methods->{$row_ident}->[$_] }) for 0 .. $#{ $info_methods->{$row_ident} };
- $sth->execute($report->id, $o1 + $_, $row + $n_header_rows, $data_row->{object}->${ \ $methods->{$row_ident}->[$_] }) for 0 .. $#{ $methods->{$row_ident} };
- $sth->execute($report->id, $o2 + $_, $row + $n_header_rows, $data_row->{raw_data}{ $raw_methods->{$row_ident}->[$_] }) for 0 .. $#{ $raw_methods->{$row_ident} };
+ my $o1 = $off1->{$row_ident};
+ my $o2 = $off2->{$row_ident};
- $sth2->execute($report->id, $row + $n_header_rows, 'information', $_) for @{ $data_row->{information} || [] };
- $sth2->execute($report->id, $row + $n_header_rows, 'errors', $_) for @{ $data_row->{errors} || [] };
- }
+ do_statement($::form, $sth, $query, $report->id, $_, $row + $n_header_rows, $data_row->{info_data}{ $info_methods->{$row_ident}->[$_] }) for 0 .. $#{ $info_methods->{$row_ident} };
+ do_statement($::form, $sth, $query, $report->id, $o1 + $_, $row + $n_header_rows, $data_row->{object}->${ \ $methods->{$row_ident}->[$_] }) for 0 .. $#{ $methods->{$row_ident} };
+ do_statement($::form, $sth, $query, $report->id, $o2 + $_, $row + $n_header_rows, $data_row->{raw_data}{ $raw_methods->{$row_ident}->[$_] }) for 0 .. $#{ $raw_methods->{$row_ident} };
- $dbh->commit;
+ do_statement($::form, $sth2, $query2, $report->id, $row + $n_header_rows, 'information', $_) for @{ $data_row->{information} || [] };
+ do_statement($::form, $sth2, $query2, $report->id, $row + $n_header_rows, 'errors', $_) for @{ $data_row->{errors} || [] };
+ }
+ 1;
+ }) or do { die SL::DB->client->error };
return $report->id;
}
}
sub init_mappings {
- $::form->{mappings} || []
+ [ grep { $_->{from} } @{ $::form->{mappings} || [] } ]
}
1;
projects / kivitendo-erp.git / blobdiff