View | Details | Raw Unified | Return to bug 33605
Collapse All | Expand All

(-)a/Koha/BackgroundJob/MARCImportCommitBatch.pm (+4 lines)
Lines 25-30 use Koha::Import::Records; Link Here
25
use C4::ImportBatch qw(
25
use C4::ImportBatch qw(
26
    BatchCommitRecords
26
    BatchCommitRecords
27
);
27
);
28
use Koha::ImportBatches;
28
29
29
=head1 NAME
30
=head1 NAME
30
31
Lines 67-72 sub process { Link Here
67
    my ( $num_added, $num_updated, $num_items_added,
68
    my ( $num_added, $num_updated, $num_items_added,
68
        $num_items_replaced, $num_items_errored, $num_ignored );
69
        $num_items_replaced, $num_items_errored, $num_ignored );
69
    try {
70
    try {
71
        my $import_batch = Koha::ImportBatches->find($import_batch_id);
72
        $import_batch->set({ import_frameworkcode => $frameworkcode })->store if $frameworkcode;
73
        $import_batch->set({ overlay_frameworkcode => $overlay_frameworkcode })->store if $overlay_frameworkcode;
70
        my $size = Koha::Import::Records->search({ import_batch_id => $import_batch_id })->count;
74
        my $size = Koha::Import::Records->search({ import_batch_id => $import_batch_id })->count;
71
        $self->size($size)->store;
75
        $self->size($size)->store;
72
        ( $num_added, $num_updated, $num_items_added,
76
        ( $num_added, $num_updated, $num_items_added,
(-)a/Koha/BackgroundJob/StageMARCForImport.pm (-2 / +8 lines)
Lines 33-38 use C4::ImportBatch qw( Link Here
33
    SetImportBatchNoMatchAction
33
    SetImportBatchNoMatchAction
34
    SetImportBatchItemAction
34
    SetImportBatchItemAction
35
);
35
);
36
use Koha::ImportBatches;
36
37
37
=head1 NAME
38
=head1 NAME
38
39
Lines 75-81 sub process { Link Here
75
    my $parse_items                = $args->{parse_items};
76
    my $parse_items                = $args->{parse_items};
76
    my $matcher_id                 = $args->{matcher_id};
77
    my $matcher_id                 = $args->{matcher_id};
77
    my $overlay_action             = $args->{overlay_action};
78
    my $overlay_action             = $args->{overlay_action};
79
    my $overlay_frameworkcode      = $args->{overlay_frameworkcode};
78
    my $nomatch_action             = $args->{nomatch_action};
80
    my $nomatch_action             = $args->{nomatch_action};
81
    my $import_frameworkcode       = $args->{import_frameworkcode};
79
    my $item_action                = $args->{item_action};
82
    my $item_action                = $args->{item_action};
80
    my $vendor_id                  = $args->{vendor_id};
83
    my $vendor_id                  = $args->{vendor_id};
81
    my $basket_id                  = $args->{basket_id};
84
    my $basket_id                  = $args->{basket_id};
Lines 131-141 sub process { Link Here
131
            $self->set({ progress => 0, status => 'failed' });
134
            $self->set({ progress => 0, status => 'failed' });
132
        }
135
        }
133
136
137
        my $import_batch = Koha::ImportBatches->find($batch_id);
134
        if ($profile_id) {
138
        if ($profile_id) {
135
            my $ibatch = Koha::ImportBatches->find($batch_id);
139
            $import_batch->set( { profile_id => $profile_id } )->store;
136
            $ibatch->set( { profile_id => $profile_id } )->store;
137
        }
140
        }
138
141
142
        $import_batch->set({ import_frameworkcode => $import_frameworkcode })->store if $import_frameworkcode;
143
        $import_batch->set({ overlay_frameworkcode => $overlay_frameworkcode })->store if $overlay_frameworkcode;
144
139
        if ($matcher_id) {
145
        if ($matcher_id) {
140
            my $matcher = C4::Matcher->fetch($matcher_id);
146
            my $matcher = C4::Matcher->fetch($matcher_id);
141
            if ( defined $matcher ) {
147
            if ( defined $matcher ) {
(-)a/api/v1/swagger/definitions/import_batch_profile.yaml (+10 lines)
Lines 22-32 properties: Link Here
22
    type:
22
    type:
23
      - string
23
      - string
24
      - "null"
24
      - "null"
25
  overlay_frameworkcode:
26
    description: what framework to add to duplicate records
27
    type:
28
      - string
29
      - "null"
25
  nomatch_action:
30
  nomatch_action:
26
    description: how to handle records where no match is found
31
    description: how to handle records where no match is found
27
    type:
32
    type:
28
      - string
33
      - string
29
      - "null"
34
      - "null"
35
  import_frameworkcode:
36
    description: what framework to add to imported records
37
    type:
38
      - string
39
      - "null"
30
  item_action:
40
  item_action:
31
    description: what to do with item records
41
    description: what to do with item records
32
    type:
42
    type:
(-)a/api/v1/swagger/paths/import_batch_profiles.yaml (+20 lines)
Lines 82-92 Link Here
82
              type:
82
              type:
83
                - string
83
                - string
84
                - "null"
84
                - "null"
85
            overlay_frameworkcode:
86
              description: what framework to add to duplicate records
87
              type:
88
                - string
89
                - "null"
85
            nomatch_action:
90
            nomatch_action:
86
              description: how to handle records where no match is found
91
              description: how to handle records where no match is found
87
              type:
92
              type:
88
                - string
93
                - string
89
                - "null"
94
                - "null"
95
            import_frameworkcode:
96
              description: what framework to add to imported records
97
              type:
98
                - string
99
                - "null"
90
            item_action:
100
            item_action:
91
              description: what to do with item records
101
              description: what to do with item records
92
              type:
102
              type:
Lines 191-201 Link Here
191
              type:
201
              type:
192
                - string
202
                - string
193
                - "null"
203
                - "null"
204
            overlay_frameworkcode:
205
              description: what framework to add to duplicate records
206
              type:
207
                - string
208
                - "null"
194
            nomatch_action:
209
            nomatch_action:
195
              description: how to handle records where no match is found
210
              description: how to handle records where no match is found
196
              type:
211
              type:
197
                - string
212
                - string
198
                - "null"
213
                - "null"
214
            import_frameworkcode:
215
              description: what framework to add to imported records
216
              type:
217
                - string
218
                - "null"
199
            item_action:
219
            item_action:
200
              description: what to do with item records
220
              description: what to do with item records
201
              type:
221
              type:
(-)a/installer/data/mysql/atomicupdate/bug_33605.pl (+38 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number => "33605",
5
    description => "Add import_framework and overlay_framework columns to import_batches table",
6
    up => sub {
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
        unless( column_exists("import_batches","overlay_frameworkcode") ){
10
            $dbh->do(q{
11
                ALTER TABLE `import_batches`
12
                ADD `overlay_frameworkcode` varchar(50) NOT NULL DEFAULT '' AFTER `overlay_action` ;
13
            });
14
            say $out "Added column 'import_batches.overlay_frameworkcode'";
15
        }
16
        unless( column_exists("import_batches","import_frameworkcode") ){
17
            $dbh->do(q{
18
                ALTER TABLE `import_batches`
19
                ADD `import_frameworkcode` varchar(50) NOT NULL DEFAULT '' AFTER `nomatch_action` ;
20
            });
21
            say $out "Added column 'import_batches.import_frameworkcode'";
22
        }
23
        unless( column_exists("import_batch_profiles","overlay_frameworkcode") ){
24
            $dbh->do(q{
25
                ALTER TABLE `import_batch_profiles`
26
                ADD `overlay_frameworkcode` varchar(50) NOT NULL DEFAULT '' AFTER `overlay_action` ;
27
            });
28
            say $out "Added column 'import_batch_profiles.overlay_frameworkcode'";
29
        }
30
        unless( column_exists("import_batch_profiles","import_frameworkcode") ){
31
            $dbh->do(q{
32
                ALTER TABLE `import_batch_profiles`
33
                ADD `import_frameworkcode` varchar(50) NOT NULL DEFAULT '' AFTER `nomatch_action` ;
34
            });
35
            say $out "Added column 'import_batch_profiles.import_frameworkcode'";
36
        }
37
    },
38
};
(-)a/installer/data/mysql/kohastructure.sql (+4 lines)
Lines 3375-3381 CREATE TABLE `import_batch_profiles` ( Link Here
3375
  `matcher_id` int(11) DEFAULT NULL COMMENT 'the id of the match rule used (matchpoints.matcher_id)',
3375
  `matcher_id` int(11) DEFAULT NULL COMMENT 'the id of the match rule used (matchpoints.matcher_id)',
3376
  `template_id` int(11) DEFAULT NULL COMMENT 'the id of the marc modification template',
3376
  `template_id` int(11) DEFAULT NULL COMMENT 'the id of the marc modification template',
3377
  `overlay_action` varchar(50) DEFAULT NULL COMMENT 'how to handle duplicate records',
3377
  `overlay_action` varchar(50) DEFAULT NULL COMMENT 'how to handle duplicate records',
3378
  `overlay_frameworkcode` varchar(50) NOT NULL DEFAULT '',
3378
  `nomatch_action` varchar(50) DEFAULT NULL COMMENT 'how to handle records where no match is found',
3379
  `nomatch_action` varchar(50) DEFAULT NULL COMMENT 'how to handle records where no match is found',
3380
  `import_frameworkcode` varchar(50) NOT NULL DEFAULT '',
3379
  `item_action` varchar(50) DEFAULT NULL COMMENT 'what to do with item records',
3381
  `item_action` varchar(50) DEFAULT NULL COMMENT 'what to do with item records',
3380
  `parse_items` tinyint(1) DEFAULT NULL COMMENT 'should items be parsed',
3382
  `parse_items` tinyint(1) DEFAULT NULL COMMENT 'should items be parsed',
3381
  `record_type` varchar(50) DEFAULT NULL COMMENT 'type of record in the batch',
3383
  `record_type` varchar(50) DEFAULT NULL COMMENT 'type of record in the batch',
Lines 3403-3409 CREATE TABLE `import_batches` ( Link Here
3403
  `num_items` int(11) NOT NULL DEFAULT 0 COMMENT 'number of items in the file',
3405
  `num_items` int(11) NOT NULL DEFAULT 0 COMMENT 'number of items in the file',
3404
  `upload_timestamp` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'date and time the file was uploaded',
3406
  `upload_timestamp` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'date and time the file was uploaded',
3405
  `overlay_action` enum('replace','create_new','use_template','ignore') NOT NULL DEFAULT 'create_new' COMMENT 'how to handle duplicate records',
3407
  `overlay_action` enum('replace','create_new','use_template','ignore') NOT NULL DEFAULT 'create_new' COMMENT 'how to handle duplicate records',
3408
  `overlay_frameworkcode` varchar(50) NOT NULL DEFAULT '',
3406
  `nomatch_action` enum('create_new','ignore') NOT NULL DEFAULT 'create_new' COMMENT 'how to handle records where no match is found',
3409
  `nomatch_action` enum('create_new','ignore') NOT NULL DEFAULT 'create_new' COMMENT 'how to handle records where no match is found',
3410
  `import_frameworkcode` varchar(50) NOT NULL DEFAULT '',
3407
  `item_action` enum('always_add','add_only_for_matches','add_only_for_new','ignore','replace') NOT NULL DEFAULT 'always_add' COMMENT 'what to do with item records',
3411
  `item_action` enum('always_add','add_only_for_matches','add_only_for_new','ignore','replace') NOT NULL DEFAULT 'always_add' COMMENT 'what to do with item records',
3408
  `import_status` enum('staging','staged','importing','imported','reverting','reverted','cleaned') NOT NULL DEFAULT 'staging' COMMENT 'the status of the imported file',
3412
  `import_status` enum('staging','staged','importing','imported','reverting','reverted','cleaned') NOT NULL DEFAULT 'staging' COMMENT 'the status of the imported file',
3409
  `batch_type` enum('batch','z3950','webservice') NOT NULL DEFAULT 'batch' COMMENT 'where this batch has come from',
3413
  `batch_type` enum('batch','z3950','webservice') NOT NULL DEFAULT 'batch' COMMENT 'where this batch has come from',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt (-2 / +44 lines)
Lines 245-250 Link Here
245
                                [% ELSE %]
245
                                [% ELSE %]
246
                                    <input type ="hidden" name="item_action" value="ignore">
246
                                    <input type ="hidden" name="item_action" value="ignore">
247
                                [% END %]
247
                                [% END %]
248
                                    [% IF ( !can_commit ) %]
249
                                        <li>
250
                                            <span class="label">New record framework: </span>
251
                                            [% SET framework_text = "Default" %]
252
                                            [% FOREACH framework IN frameworks %]
253
                                                [% IF import_frameworkcode == framework.frameworkcode %]
254
                                                    [% SET framework_text = framework.frameworktext %]
255
                                                [% END %]
256
                                            [% END %]
257
                                            <span>[% framework_text | html %]</span>
258
                                        </li>
259
                                        <li>
260
                                            <span class="label">Replacement record framework: </span>
261
                                            [% SET overlay_framework_text = "Default" %]
262
                                            [% FOREACH framework IN frameworks %]
263
                                                [% IF overlay_frameworkcode == framework.frameworkcode %]
264
                                                    [% SET overlay_framework_text = framework.frameworktext %]
265
                                                [% END %]
266
                                            [% END %]
267
                                            [% IF overlay_frameworkcode == "_USE_ORIG_" %]
268
                                                [% SET overlay_framework_text = "Keep original framework" %]
269
                                            [% END %]
270
                                            <span>[% overlay_framework_text | html %]</span>
271
                                        </li>
272
                                    [% END %]
248
                            </ol>
273
                            </ol>
249
                            [% IF ( can_commit ) %]
274
                            [% IF ( can_commit ) %]
250
                                    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Apply different matching rules" /></fieldset>
275
                                    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Apply different matching rules" /></fieldset>
Lines 265-271 Link Here
265
                                                    <select name="framework" id="frameworks">
290
                                                    <select name="framework" id="frameworks">
266
                                                        <option value="">Default</option>
291
                                                        <option value="">Default</option>
267
                                                        [% FOREACH framework IN frameworks %]
292
                                                        [% FOREACH framework IN frameworks %]
268
                                                            <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
293
                                                            [% IF import_frameworkcode == framework.frameworkcode %]
294
                                                                <option value="[% framework.frameworkcode | html %]" selected = "selected">[% framework.frameworktext | html %]</option>
295
                                                            [% ELSE %]
296
                                                                <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
297
                                                            [% END %]
269
                                                        [% END %]
298
                                                        [% END %]
270
                                                    </select>
299
                                                    </select>
271
                                                    <div class="hint">New bibliographic records will use this framework</div>
300
                                                    <div class="hint">New bibliographic records will use this framework</div>
Lines 273-282 Link Here
273
                                                <li>
302
                                                <li>
274
                                                    <label for="overlay_framework">Replacement record framework:</label>
303
                                                    <label for="overlay_framework">Replacement record framework:</label>
275
                                                    <select name="overlay_framework" id="overlay_frameworks">
304
                                                    <select name="overlay_framework" id="overlay_frameworks">
305
                                                    [% IF overlay_frameworkcode == "_USE_ORIG_" %]
306
                                                        <option value="_USE_ORIG_" selected="selected">Keep original framework</option>
307
                                                    [% ELSE %]
276
                                                        <option value="_USE_ORIG_">Keep original framework</option>
308
                                                        <option value="_USE_ORIG_">Keep original framework</option>
309
                                                    [% END %]
310
311
                                                    [% IF overlay_frameworkcode == "" %]
312
                                                        <option value="" selected="selected">Default</option>
313
                                                    [% ELSE %]
277
                                                        <option value="">Default</option>
314
                                                        <option value="">Default</option>
315
                                                    [% END %]
278
                                                        [% FOREACH framework IN frameworks %]
316
                                                        [% FOREACH framework IN frameworks %]
279
                                                            <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
317
                                                            [% IF overlay_frameworkcode == framework.frameworkcode %]
318
                                                                <option value="[% framework.frameworkcode | html %]" selected="selected">[% framework.frameworktext | html %]</option>
319
                                                            [% ELSE %]
320
                                                                <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
321
                                                            [% END %]
280
                                                        [% END %]
322
                                                        [% END %]
281
                                                    </select>
323
                                                    </select>
282
                                                    <div class="hint">Replacement records will use this framework</div>
324
                                                    <div class="hint">Replacement records will use this framework</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt (+25 lines)
Lines 160-165 Link Here
160
            [% END %]
160
            [% END %]
161
        </select>
161
        </select>
162
    </li>
162
    </li>
163
    <li>
164
        <label for="import_frameworkcode">Add new bibliographic records into this framework:</label>
165
        <select name="import_frameworkcode" id="import_frameworkcode">
166
            <option value="">Default</option>
167
            [% FOREACH framework IN frameworks %]
168
                <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
169
            [% END %]
170
        </select>
171
    </li>
163
</ol></fieldset>
172
</ol></fieldset>
164
173
165
  [% IF MarcModificationTemplatesLoop %]
174
  [% IF MarcModificationTemplatesLoop %]
Lines 193-198 Link Here
193
      <li><label for="overlay_action">Action if matching record found: </label>
202
      <li><label for="overlay_action">Action if matching record found: </label>
194
           [% INCLUDE 'tools-overlay-action.inc' %]
203
           [% INCLUDE 'tools-overlay-action.inc' %]
195
      </li>
204
      </li>
205
    <li>
206
        <label for="overlay_frameworkcode">When replacing records use this framework:</label>
207
        <select name="overlay_frameworkcode" id="overlay_frameworkcode">
208
            <option value="_USE_ORIG_">Keep original framework</option>
209
            <option value="">Default</option>
210
            [% FOREACH framework IN frameworks %]
211
                <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
212
            [% END %]
213
        </select>
214
    </li>
196
      <li><label for="nomatch_action">Action if no match is found: </label>
215
      <li><label for="nomatch_action">Action if no match is found: </label>
197
           [% INCLUDE 'tools-nomatch-action.inc' %]
216
           [% INCLUDE 'tools-nomatch-action.inc' %]
198
      </li>
217
      </li>
Lines 298-304 Link Here
298
                    $("#marc_modification_template_id").val("").change();
317
                    $("#marc_modification_template_id").val("").change();
299
                    $("#matcher").val("").change();
318
                    $("#matcher").val("").change();
300
                    $("#overlay_action").val('replace').change();
319
                    $("#overlay_action").val('replace').change();
320
                    $("#overlay_frameworkcode").val('').change();
301
                    $("#nomatch_action").val('create_new').change();
321
                    $("#nomatch_action").val('create_new').change();
322
                    $("#import_frameworkcode").val('').change();
302
                    $("#parse_itemsyes").prop("checked", true).change();
323
                    $("#parse_itemsyes").prop("checked", true).change();
303
                    $("#item_action").val('always_add').change();
324
                    $("#item_action").val('always_add').change();
304
                    $("#profile_name").val('').keyup();
325
                    $("#profile_name").val('').keyup();
Lines 315-321 Link Here
315
                    $("#marc_modification_template_id").val(profile.template_id).change();
336
                    $("#marc_modification_template_id").val(profile.template_id).change();
316
                    $("#matcher").val(profile.matcher_id).change();
337
                    $("#matcher").val(profile.matcher_id).change();
317
                    $("#overlay_action").val(profile.overlay_action).change();
338
                    $("#overlay_action").val(profile.overlay_action).change();
339
                    $("#overlay_frameworkcode").val(profile.overlay_frameworkcode).change();
318
                    $("#nomatch_action").val(profile.nomatch_action).change();
340
                    $("#nomatch_action").val(profile.nomatch_action).change();
341
                    $("#import_frameworkcode").val(profile.import_frameworkcode).change();
319
                    $("input[name='parse_items'][value='"+(profile.parse_items?'1':'0')+"']").prop("checked", true).change();
342
                    $("input[name='parse_items'][value='"+(profile.parse_items?'1':'0')+"']").prop("checked", true).change();
320
                    $("#item_action").val(profile.item_action).change();
343
                    $("#item_action").val(profile.item_action).change();
321
                    $("#profile_name").val(profile.name).keyup();
344
                    $("#profile_name").val(profile.name).keyup();
Lines 358-364 Link Here
358
                        template_id: $("#marc_modification_template_id").val() || null,
381
                        template_id: $("#marc_modification_template_id").val() || null,
359
                        matcher_id: $("#matcher").val() || null,
382
                        matcher_id: $("#matcher").val() || null,
360
                        overlay_action: $("#overlay_action").val() || null,
383
                        overlay_action: $("#overlay_action").val() || null,
384
                        overlay_frameworkcode: $("#overlay_frameworkcode").val() || "",
361
                        nomatch_action: $("#nomatch_action").val() || null,
385
                        nomatch_action: $("#nomatch_action").val() || null,
386
                        import_frameworkcode: $("#import_frameworkcode").val() || "",
362
                        parse_items: !!parseInt($("input[name='parse_items']:checked").val()) || null,
387
                        parse_items: !!parseInt($("input[name='parse_items']:checked").val()) || null,
363
                        item_action: $("#item_action").val() || null,
388
                        item_action: $("#item_action").val() || null,
364
                        name: name
389
                        name: name
(-)a/tools/manage-marc-import.pl (+3 lines)
Lines 285-294 sub batch_info { Link Here
285
    $template->param(profile => $batch->{'profile'});
285
    $template->param(profile => $batch->{'profile'});
286
    $template->param(comments => $batch->{'comments'});
286
    $template->param(comments => $batch->{'comments'});
287
    $template->param(import_status => $batch->{'import_status'});
287
    $template->param(import_status => $batch->{'import_status'});
288
    $template->param(import_frameworkcode => $batch->{'import_frameworkcode'});
289
    $template->param(overlay_frameworkcode => $batch->{'overlay_frameworkcode'});
288
    $template->param(upload_timestamp => $batch->{'upload_timestamp'});
290
    $template->param(upload_timestamp => $batch->{'upload_timestamp'});
289
    $template->{VARS}->{'record_type'} = $batch->{'record_type'};
291
    $template->{VARS}->{'record_type'} = $batch->{'record_type'};
290
    $template->param(num_records => $batch->{'num_records'});
292
    $template->param(num_records => $batch->{'num_records'});
291
    $template->param(num_items => $batch->{'num_items'});
293
    $template->param(num_items => $batch->{'num_items'});
294
    $template->param(batch => $batch);
292
    if ($batch->{'import_status'} ne 'cleaned') {
295
    if ($batch->{'import_status'} ne 'cleaned') {
293
        $template->param(can_clean => 1);
296
        $template->param(can_clean => 1);
294
    }
297
    }
(-)a/tools/stage-marc-import.pl (-1 / +9 lines)
Lines 42-54 use C4::MarcModificationTemplates qw( GetModificationTemplates ); Link Here
42
use Koha::Plugins;
42
use Koha::Plugins;
43
use Koha::ImportBatches;
43
use Koha::ImportBatches;
44
use Koha::BackgroundJob::StageMARCForImport;
44
use Koha::BackgroundJob::StageMARCForImport;
45
use Koha::BiblioFrameworks;
45
46
46
my $input = CGI->new;
47
my $input = CGI->new;
47
48
48
my $fileID                     = $input->param('uploadedfileid');
49
my $fileID                     = $input->param('uploadedfileid');
49
my $matcher_id                 = $input->param('matcher');
50
my $matcher_id                 = $input->param('matcher');
50
my $overlay_action             = $input->param('overlay_action');
51
my $overlay_action             = $input->param('overlay_action');
52
my $overlay_frameworkcode      = $input->param('overlay_frameworkcode');
51
my $nomatch_action             = $input->param('nomatch_action');
53
my $nomatch_action             = $input->param('nomatch_action');
54
my $import_frameworkcode       = $input->param('import_frameworkcode');
52
my $parse_items                = $input->param('parse_items');
55
my $parse_items                = $input->param('parse_items');
53
my $item_action                = $input->param('item_action');
56
my $item_action                = $input->param('item_action');
54
my $comments                   = $input->param('comments');
57
my $comments                   = $input->param('comments');
Lines 70-78 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
70
    }
73
    }
71
);
74
);
72
75
76
my $frameworks = Koha::BiblioFrameworks->search({ tagfield => { 'not' => undef } }, { join => 'marc_tag_structure', distinct => 'frameworkcode', order_by => ['frameworktext'] });
77
73
$template->param(
78
$template->param(
74
    basketno     => $basketno,
79
    basketno     => $basketno,
75
    booksellerid => $booksellerid,
80
    booksellerid => $booksellerid,
81
    frameworks   => $frameworks,
76
);
82
);
77
83
78
if ($fileID) {
84
if ($fileID) {
Lines 91-100 if ($fileID) { Link Here
91
        parse_items                => $parse_items,
97
        parse_items                => $parse_items,
92
        matcher_id                 => $matcher_id,
98
        matcher_id                 => $matcher_id,
93
        overlay_action             => $overlay_action,
99
        overlay_action             => $overlay_action,
100
        overlay_frameworkcode      => $overlay_frameworkcode,
94
        nomatch_action             => $nomatch_action,
101
        nomatch_action             => $nomatch_action,
102
        import_frameworkcode       => $import_frameworkcode,
95
        item_action                => $item_action,
103
        item_action                => $item_action,
96
        basket_id                  => $basketno,
104
        basket_id                  => $basketno,
97
        vendor_id                  => $booksellerid,
105
        vendor_id                  => $booksellerid,
106
        profile_id                  => $profile_id,
98
    };
107
    };
99
    try {
108
    try {
100
        my $job_id = Koha::BackgroundJob::StageMARCForImport->new->enqueue( $params );
109
        my $job_id = Koha::BackgroundJob::StageMARCForImport->new->enqueue( $params );
101
- 

Return to bug 33605