|
Lines 99-105
if ($op eq "") {
Link Here
|
| 99 |
add_saved_job_results_to_template($template, $completedJobID); |
99 |
add_saved_job_results_to_template($template, $completedJobID); |
| 100 |
} else { |
100 |
} else { |
| 101 |
my $framework = $input->param('framework'); |
101 |
my $framework = $input->param('framework'); |
| 102 |
commit_batch($template, $import_batch_id, $framework); |
102 |
my $overlay_framework = $input->param('overlay_framework'); |
|
|
103 |
commit_batch($template, $import_batch_id, $framework, $overlay_framework); |
| 103 |
} |
104 |
} |
| 104 |
import_records_list($template, $import_batch_id, $offset, $results_per_page); |
105 |
import_records_list($template, $import_batch_id, $offset, $results_per_page); |
| 105 |
} elsif ($op eq "revert-batch") { |
106 |
} elsif ($op eq "revert-batch") { |
|
Lines 230-236
sub import_batches_list {
Link Here
|
| 230 |
} |
231 |
} |
| 231 |
|
232 |
|
| 232 |
sub commit_batch { |
233 |
sub commit_batch { |
| 233 |
my ($template, $import_batch_id, $framework) = @_; |
234 |
my ($template, $import_batch_id, $framework, $overlay_framework) = @_; |
| 234 |
|
235 |
|
| 235 |
my $job = undef; |
236 |
my $job = undef; |
| 236 |
my ( $num_added, $num_updated, $num_items_added, |
237 |
my ( $num_added, $num_updated, $num_items_added, |
|
Lines 243-254
sub commit_batch {
Link Here
|
| 243 |
$job = put_in_background($import_batch_id); |
244 |
$job = put_in_background($import_batch_id); |
| 244 |
$callback = progress_callback( $job, $dbh ); |
245 |
$callback = progress_callback( $job, $dbh ); |
| 245 |
} |
246 |
} |
|
|
247 |
my $params = { |
| 248 |
batch_id => $import_batch_id, |
| 249 |
framework => $framework, |
| 250 |
progress_interval => 50, |
| 251 |
progress_callback => $callback |
| 252 |
}; |
| 253 |
$params->{overlay_framework} = $overlay_framework unless $overlay_framework eq '_USE_ORIG_'; |
| 254 |
|
| 246 |
( |
255 |
( |
| 247 |
$num_added, $num_updated, $num_items_added, |
256 |
$num_added, $num_updated, $num_items_added, |
| 248 |
$num_items_replaced, $num_items_errored, $num_ignored |
257 |
$num_items_replaced, $num_items_errored, $num_ignored |
| 249 |
) |
258 |
) |
| 250 |
= BatchCommitRecords( $import_batch_id, $framework, 50, |
259 |
= BatchCommitRecords($params); |
| 251 |
$callback ); |
|
|
| 252 |
} |
260 |
} |
| 253 |
); |
261 |
); |
| 254 |
|
262 |
|
| 255 |
- |
|
|