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

(-)a/C4/ImportBatch.pm (-7 / +18 lines)
Lines 206-212 sub AddImportBatch { Link Here
206
    my (@fields, @vals);
206
    my (@fields, @vals);
207
    foreach (qw( matcher_id template_id branchcode
207
    foreach (qw( matcher_id template_id branchcode
208
                 overlay_action nomatch_action item_action
208
                 overlay_action nomatch_action item_action
209
                 import_status batch_type file_name comments record_type )) {
209
                 import_status batch_type file_name comments
210
                 record_type is_order )) {
210
        if (exists $params->{$_}) {
211
        if (exists $params->{$_}) {
211
            push @fields, $_;
212
            push @fields, $_;
212
            push @vals, $params->{$_};
213
            push @vals, $params->{$_};
Lines 319-325 sub ModAuthInBatch { Link Here
319
  ($batch_id, $num_records, $num_items, @invalid_records) = 
320
  ($batch_id, $num_records, $num_items, @invalid_records) = 
320
    BatchStageMarcRecords($encoding, $marc_records, $file_name, $marc_modification_template,
321
    BatchStageMarcRecords($encoding, $marc_records, $file_name, $marc_modification_template,
321
                          $comments, $branch_code, $parse_items,
322
                          $comments, $branch_code, $parse_items,
322
                          $leave_as_staging, 
323
                          $leave_as_staging, is_order,
323
                          $progress_interval, $progress_callback);
324
                          $progress_interval, $progress_callback);
324
325
325
=cut
326
=cut
Lines 334-339 sub BatchStageMarcRecords { Link Here
334
    my $branch_code = shift;
335
    my $branch_code = shift;
335
    my $parse_items = shift;
336
    my $parse_items = shift;
336
    my $leave_as_staging = shift;
337
    my $leave_as_staging = shift;
338
    my $is_order = shift;
337
339
338
    # optional callback to monitor status 
340
    # optional callback to monitor status 
339
    # of job
341
    # of job
Lines 353-358 sub BatchStageMarcRecords { Link Here
353
            file_name => $file_name,
355
            file_name => $file_name,
354
            comments => $comments,
356
            comments => $comments,
355
            record_type => $record_type,
357
            record_type => $record_type,
358
            is_order => $is_order,
356
        } );
359
        } );
357
    if ($parse_items) {
360
    if ($parse_items) {
358
        SetImportBatchItemAction($batch_id, 'always_add');
361
        SetImportBatchItemAction($batch_id, 'always_add');
Lines 953-973 sub GetStagedWebserviceBatches { Link Here
953
956
954
=head2 GetImportBatchRangeDesc
957
=head2 GetImportBatchRangeDesc
955
958
956
  my $results = GetImportBatchRangeDesc($offset, $results_per_group);
959
  my $results = GetImportBatchRangeDesc($offset, $results_per_group, $is_order);
957
960
958
Returns a reference to an array of hash references corresponding to
961
Returns a reference to an array of hash references corresponding to
959
import_batches rows (sorted in descending order by import_batch_id)
962
import_batches rows (sorted in descending order by import_batch_id)
960
start at the given offset.
963
start at the given offset.
961
964
965
Pass in $is_order = 1 to get only batches marked as order records
966
962
=cut
967
=cut
963
968
964
sub GetImportBatchRangeDesc {
969
sub GetImportBatchRangeDesc {
965
    my ($offset, $results_per_group) = @_;
970
    my ($offset, $results_per_group,$is_order) = @_;
971
972
    my $is_order_limit = $is_order ? "AND is_order = 1" : q{};
966
973
967
    my $dbh = C4::Context->dbh;
974
    my $dbh = C4::Context->dbh;
968
    my $query = "SELECT * FROM import_batches
975
    my $query = "
969
                                    WHERE batch_type IN ('batch', 'webservice')
976
        SELECT * FROM import_batches
970
                                    ORDER BY import_batch_id DESC";
977
        WHERE batch_type IN ('batch', 'webservice')
978
        $is_order_limit
979
        ORDER BY import_batch_id DESC
980
    ";
981
971
    my @params;
982
    my @params;
972
    if ($results_per_group){
983
    if ($results_per_group){
973
        $query .= " LIMIT ?";
984
        $query .= " LIMIT ?";
(-)a/acqui/addorderiso2709.pl (-6 / +47 lines)
Lines 58-69 my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({ Link Here
58
my $cgiparams = $input->Vars;
58
my $cgiparams = $input->Vars;
59
my $op = $cgiparams->{'op'} || '';
59
my $op = $cgiparams->{'op'} || '';
60
my $booksellerid  = $input->param('booksellerid');
60
my $booksellerid  = $input->param('booksellerid');
61
my $is_order = $input->param('is_order');
61
my $bookseller = GetBookSellerFromId($booksellerid);
62
my $bookseller = GetBookSellerFromId($booksellerid);
62
my $data;
63
my $data;
63
64
64
$template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl",
65
$template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl",
65
                booksellerid => $booksellerid,
66
                booksellerid => $booksellerid,
66
                booksellername => $bookseller->{name},
67
                booksellername => $bookseller->{name},
68
                is_order => $is_order,
67
                );
69
                );
68
70
69
if ($cgiparams->{'import_batch_id'} && $op eq ""){
71
if ($cgiparams->{'import_batch_id'} && $op eq ""){
Lines 81-87 if (! $cgiparams->{'basketno'}){ Link Here
81
if ($op eq ""){
83
if ($op eq ""){
82
    $template->param("basketno" => $cgiparams->{'basketno'});
84
    $template->param("basketno" => $cgiparams->{'basketno'});
83
#display batches
85
#display batches
84
    import_batches_list($template);
86
    import_batches_list( $template, $is_order );
85
#
87
#
86
# 2nd step = display the content of the choosen file
88
# 2nd step = display the content of the choosen file
87
#
89
#
Lines 268-273 if ($op eq ""){ Link Here
268
            my @serials      = $input->param('serial');
270
            my @serials      = $input->param('serial');
269
            my @ind_tag   = $input->param('ind_tag');
271
            my @ind_tag   = $input->param('ind_tag');
270
            my @indicator = $input->param('indicator');
272
            my @indicator = $input->param('indicator');
273
274
            if ($is_order) {
275
                my ( $notforloan_field, $notforloan_subfield ) =
276
                  GetMarcFromKohaField('items.notforloan');
277
                push( @tags,         $notforloan_field );
278
                push( @subfields,    $notforloan_subfield );
279
                push( @field_values, '-1' );
280
281
                my ( $homebranch_field, $homebranch_subfield ) =
282
                  GetMarcFromKohaField('items.homebranch');
283
                push( @tags,         $homebranch_field );
284
                push( @subfields,    $homebranch_subfield );
285
                push( @field_values, C4::Context->userenv->{'branch'} );
286
287
                my ( $holdingbranch_field, $holdingbranch_subfield ) =
288
                  GetMarcFromKohaField('items.holdingbranch');
289
                push( @tags,         $holdingbranch_field );
290
                push( @subfields,    $holdingbranch_subfield );
291
                push( @field_values, C4::Context->userenv->{'branch'} );
292
293
                my $infos = get_infos_syspref($marcrecord, ['itype']);
294
                my ( $itype_field, $itype_subfield ) =
295
                  GetMarcFromKohaField('items.itype');
296
                push( @tags,         $itype_field );
297
                push( @subfields,    $itype_subfield );
298
                push( @field_values, $infos->{itype} );
299
            }
300
271
            my $item;
301
            my $item;
272
            push @{ $item->{tags} },         $tags[0];
302
            push @{ $item->{tags} },         $tags[0];
273
            push @{ $item->{subfields} },    $subfields[0];
303
            push @{ $item->{subfields} },    $subfields[0];
Lines 323-330 output_html_with_http_headers $input, $cookie, $template->output; Link Here
323
353
324
354
325
sub import_batches_list {
355
sub import_batches_list {
326
    my ($template) = @_;
356
    my ($template, $is_order) = @_;
327
    my $batches = GetImportBatchRangeDesc();
357
    my $batches = GetImportBatchRangeDesc(undef,undef,$is_order);
328
358
329
    my @list = ();
359
    my @list = ();
330
    foreach my $batch (@$batches) {
360
    foreach my $batch (@$batches) {
Lines 419-424 sub import_biblios_list { Link Here
419
                        item_action => $item_action
449
                        item_action => $item_action
420
                    );
450
                    );
421
    batch_info($template, $batch);
451
    batch_info($template, $batch);
452
453
    return \@list;
422
}
454
}
423
455
424
sub batch_info {
456
sub batch_info {
Lines 462-469 sub add_matcher_list { Link Here
462
    $template->param(available_matchers => \@matchers);
494
    $template->param(available_matchers => \@matchers);
463
}
495
}
464
496
465
sub get_infos_syspref {
497
sub GetMarcFieldsToOrderAsYAML {
466
    my ($record, $field_list) = @_;
467
    my $syspref = C4::Context->preference('MarcFieldsToOrder');
498
    my $syspref = C4::Context->preference('MarcFieldsToOrder');
468
    $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
499
    $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
469
    my $yaml = eval {
500
    my $yaml = eval {
Lines 471-478 sub get_infos_syspref { Link Here
471
    };
502
    };
472
    if ( $@ ) {
503
    if ( $@ ) {
473
        warn "Unable to parse MarcFieldsToOrder syspref : $@";
504
        warn "Unable to parse MarcFieldsToOrder syspref : $@";
474
        return ();
505
        return;
506
    } else {
507
        return $yaml;
475
    }
508
    }
509
}
510
511
sub get_infos_syspref {
512
    my ($record, $field_list) = @_;
513
514
    my $yaml = GetMarcFieldsToOrderAsYAML;
515
    return unless $yaml;
516
476
    my $r;
517
    my $r;
477
    for my $field_name ( @$field_list ) {
518
    for my $field_name ( @$field_list ) {
478
        next unless exists $yaml->{$field_name};
519
        next unless exists $yaml->{$field_name};
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 1004-1009 CREATE TABLE `import_batches` ( -- information about batches of marc records tha Link Here
1004
  `record_type` enum('biblio', 'auth', 'holdings') NOT NULL default 'biblio', -- type of record in the batch
1004
  `record_type` enum('biblio', 'auth', 'holdings') NOT NULL default 'biblio', -- type of record in the batch
1005
  `file_name` varchar(100), -- the name of the file uploaded
1005
  `file_name` varchar(100), -- the name of the file uploaded
1006
  `comments` mediumtext, -- any comments added when the file was uploaded
1006
  `comments` mediumtext, -- any comments added when the file was uploaded
1007
  `is_order` tinyint(1) NOT NULL DEFAULT '0', -- defines if this is an Order Record for processing
1007
  PRIMARY KEY (`import_batch_id`),
1008
  PRIMARY KEY (`import_batch_id`),
1008
  KEY `branchcode` (`branchcode`)
1009
  KEY `branchcode` (`branchcode`)
1009
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1010
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 8697-8702 if ( CheckVersion($DBversion) ) { Link Here
8697
    SetVersion ($DBversion);
8697
    SetVersion ($DBversion);
8698
}
8698
}
8699
8699
8700
8701
$DBversion = "3.17.00.XXX";
8702
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
8703
    $dbh->do("ALTER TABLE import_batches ADD is_order BOOLEAN NOT NULL DEFAULT '0' AFTER comments");
8704
   print "Upgrade to $DBversion done (Bug 10877 - Add 'Order Record' processing)\n";
8705
   SetVersion ($DBversion);
8706
}
8707
8700
=head1 FUNCTIONS
8708
=head1 FUNCTIONS
8701
8709
8702
=head2 TableExists($table)
8710
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc (+1 lines)
Lines 17-22 Link Here
17
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a new (empty) record</a></li>
17
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a new (empty) record</a></li>
18
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From an external source</a></li>
18
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From an external source</a></li>
19
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]"> From a staged file</a></li>
19
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]"> From a staged file</a></li>
20
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;is_order=1"> From a staged order file</a></li>
20
        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From titles with highest hold ratios</a></li>[% END %]
21
        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From titles with highest hold ratios</a></li>[% END %]
21
      </ul>
22
      </ul>
22
    [% ELSE %]
23
    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-8 / +24 lines)
Lines 138-144 Link Here
138
138
139
            return disableUnchecked($(this));
139
            return disableUnchecked($(this));
140
        });
140
        });
141
141
        $('#tabs').tabs();
142
        $('#tabs').tabs();
143
144
        [% IF is_order %]
145
            $("#checkAll").click();
146
        [% END %]
142
    });
147
    });
143
148
144
    function disableUnchecked(form){
149
    function disableUnchecked(form){
Lines 166-172 Link Here
166
                <div id="tabs" class="toptabs">
171
                <div id="tabs" class="toptabs">
167
                  <ul>
172
                  <ul>
168
                    <li><a href="#records_to_import">Select to import</a></li>
173
                    <li><a href="#records_to_import">Select to import</a></li>
169
                    <li><a href="#items_info" class="items_info">Item information</a></li>
174
                    [% UNLESS is_order %]
175
                        <li><a href="#items_info" class="items_info">Item information</a></li>
176
                    [% END %]
170
                    <li><a href="#accounting_details">Default accounting details</a></li>
177
                    <li><a href="#accounting_details">Default accounting details</a></li>
171
                  </ul>
178
                  </ul>
172
179
Lines 185-190 Link Here
185
                            <input type="hidden" name="[% cur.currency %]" value="[% cur.rate %]" />
192
                            <input type="hidden" name="[% cur.currency %]" value="[% cur.rate %]" />
186
                        [% END %]
193
                        [% END %]
187
194
195
                        [% IF is_order %]
196
                            <p>
197
                                <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
198
                            </p>
199
                        [% END %]
200
188
                        [% FOREACH biblio IN biblio_list %]
201
                        [% FOREACH biblio IN biblio_list %]
189
                        <fieldset class="biblio unselected rows" style="float:none;">
202
                        <fieldset class="biblio unselected rows" style="float:none;">
190
                          <legend>
203
                          <legend>
Lines 261-271 Link Here
261
                        </fieldset>
274
                        </fieldset>
262
                        [% END %]
275
                        [% END %]
263
                      </div>
276
                      </div>
277
                      [% IF ( items && !is_order ) %]
264
                      <div id="items_info">
278
                      <div id="items_info">
265
                        <h2>Item information</h2>
279
                        <h2>Item information</h2>
266
                        <p>Import all the checked items in the basket with the following parameters:</p>
280
                        <p>Import all the checked items in the basket with the following parameters:</p>
267
281
268
                        [% IF ( items ) %]
269
                        <fieldset class="rows" style="float:none;">
282
                        <fieldset class="rows" style="float:none;">
270
                            <legend>Item</legend>
283
                            <legend>Item</legend>
271
                            [% IF ( NoACQframework ) %]
284
                            [% IF ( NoACQframework ) %]
Lines 297-304 Link Here
297
                            </div>
310
                            </div>
298
                            [% END %] <!-- /items -->
311
                            [% END %] <!-- /items -->
299
                        </fieldset>
312
                        </fieldset>
300
                        [% END %] <!-- items -->
301
                      </div>
313
                      </div>
314
                      [% END %] <!-- items tab -->
302
                      <div id="accounting_details">
315
                      <div id="accounting_details">
303
                        <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
316
                        <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
304
                        <fieldset class="rows" style="float:none;">
317
                        <fieldset class="rows" style="float:none;">
Lines 348-353 Link Here
348
                                    <label for="all_order_vendornote">Vendor note: </label>
361
                                    <label for="all_order_vendornote">Vendor note: </label>
349
                                    <textarea id="all_order_vendornote" cols="30" rows="3" name="all_order_vendornote"></textarea>
362
                                    <textarea id="all_order_vendornote" cols="30" rows="3" name="all_order_vendornote"></textarea>
350
                                </li>
363
                                </li>
364
                                [% UNLESS is_order %]
351
                                <li>
365
                                <li>
352
                                    <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
366
                                    <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
353
                                    <label for="all_sort1">Statistic 1: </label>
367
                                    <label for="all_sort1">Statistic 1: </label>
Lines 357-370 Link Here
357
                                    <label for="all_sort2">Statistic 2: </label>
371
                                    <label for="all_sort2">Statistic 2: </label>
358
                                    <input type="text" id="all_sort2" size="20" name="all_sort2" value="" />
372
                                    <input type="text" id="all_sort2" size="20" name="all_sort2" value="" />
359
                                </li>
373
                                </li>
374
                                [% END %]
360
                            </ol>
375
                            </ol>
361
                        </fieldset>
376
                        </fieldset>
362
                      </div>
377
                      </div>
363
                      </div>
378
                      </div>
364
379
365
                      <fieldset class="action">
380
                        <fieldset class="action">
366
                          <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
381
                            <input type="hidden" name="is_order" value="[% is_order %]" />
367
                      </fieldset>
382
                            <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
383
                        </fieldset>
368
                    </form>
384
                    </form>
369
                [% ELSE %]
385
                [% ELSE %]
370
                <div>
386
                <div>
Lines 403-410 Link Here
403
                          [% END %]
419
                          [% END %]
404
                        </td>
420
                        </td>
405
                        <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td>
421
                        <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td>
406
                        <td>[% batch_lis.num_records %]</td>
422
                        <td>[% batch_lis.num_biblios %]</td>
407
                        <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
423
                        <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]&amp;is_order=[% is_order %]">Add orders</a></td>
408
                      </tr>
424
                      </tr>
409
                      [% END %]
425
                      [% END %]
410
                    </tbody>
426
                    </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt (+4 lines)
Lines 112-117 function CheckForm(f) { Link Here
112
            <option value='auth'>Authority</option>
112
            <option value='auth'>Authority</option>
113
        </select>
113
        </select>
114
    </li>
114
    </li>
115
    <li>
116
        <input type="checkbox" name="is_order" id="is_order" />
117
        <label for="is_order">Is an order file:</label>
118
    </li>
115
	<li>
119
	<li>
116
		<label for="encoding">Character encoding: </label>
120
		<label for="encoding">Character encoding: </label>
117
            <select name="encoding" id="encoding"><option value="utf8" selected="selected">UTF-8 (Default)</option><option value="MARC-8">MARC 8</option><option value="ISO_5426">ISO 5426</option><option value="ISO_6937">ISO 6937</option><option value=ISO_8859-1">ISO 8859-1</option><option value="EUC-KR">EUC-KR</option></select>
121
            <select name="encoding" id="encoding"><option value="utf8" selected="selected">UTF-8 (Default)</option><option value="MARC-8">MARC 8</option><option value="ISO_5426">ISO 5426</option><option value="ISO_6937">ISO 6937</option><option value=ISO_8859-1">ISO 8859-1</option><option value="EUC-KR">EUC-KR</option></select>
(-)a/misc/stage_file.pl (-1 / +4 lines)
Lines 45-50 my $input_file = ""; Link Here
45
my $batch_comment = "";
45
my $batch_comment = "";
46
my $want_help = 0;
46
my $want_help = 0;
47
my $no_replace ;
47
my $no_replace ;
48
my $is_order = 0;
48
my $item_action = 'always_add';
49
my $item_action = 'always_add';
49
50
50
my $result = GetOptions(
51
my $result = GetOptions(
Lines 56-61 my $result = GetOptions( Link Here
56
    'no-replace'    => \$no_replace,
57
    'no-replace'    => \$no_replace,
57
    'comment:s'     => \$batch_comment,
58
    'comment:s'     => \$batch_comment,
58
    'authorities'   => \$authorities,
59
    'authorities'   => \$authorities,
60
    'is-order'      => \$is_order,
59
    'h|help'        => \$want_help
61
    'h|help'        => \$want_help
60
);
62
);
61
63
Lines 101-107 sub process_batch { Link Here
101
103
102
    print "... staging MARC records -- please wait\n";
104
    print "... staging MARC records -- please wait\n";
103
    my ($batch_id, $num_valid_records, $num_items, @import_errors) =
105
    my ($batch_id, $num_valid_records, $num_items, @import_errors) =
104
        BatchStageMarcRecords($record_type, $encoding, $marc_records, $input_file, undef, $batch_comment, '', $add_items, 0,
106
        BatchStageMarcRecords($record_type, $encoding, $marc_records, $input_file, undef, $batch_comment, '', $add_items, 0, $is_order,
105
                              100, \&print_progress_and_commit);
107
                              100, \&print_progress_and_commit);
106
    print "... finished staging MARC records\n";
108
    print "... finished staging MARC records\n";
107
109
Lines 198-203 Parameters: Link Here
198
                            the record batch; if the comment
200
                            the record batch; if the comment
199
                            has spaces in it, surround the
201
                            has spaces in it, surround the
200
                            comment with quotation marks.
202
                            comment with quotation marks.
203
    --is-order              this file is a bibliographic order file
201
    --help or -h            show this message.
204
    --help or -h            show this message.
202
_USAGE_
205
_USAGE_
203
}
206
}
(-)a/tools/stage-marc-import.pl (-3 / +3 lines)
Lines 55-60 my $parse_items = $input->param('parse_items'); Link Here
55
my $item_action = $input->param('item_action');
55
my $item_action = $input->param('item_action');
56
my $comments = $input->param('comments');
56
my $comments = $input->param('comments');
57
my $record_type = $input->param('record_type');
57
my $record_type = $input->param('record_type');
58
my $is_order = $input->param('is_order') eq 'on';
58
my $encoding = $input->param('encoding');
59
my $encoding = $input->param('encoding');
59
my $marc_modification_template = $input->param('marc_modification_template_id');
60
my $marc_modification_template = $input->param('marc_modification_template_id');
60
61
Lines 132-139 if ($completedJobID) { Link Here
132
        $marcrecord,                 $filename,
133
        $marcrecord,                 $filename,
133
        $marc_modification_template, $comments,
134
        $marc_modification_template, $comments,
134
        '',                          $parse_items,
135
        '',                          $parse_items,
135
        0,                           50,
136
        0,                           $is_order,
136
        staging_progress_callback( $job, $dbh )
137
        50, staging_progress_callback( $job, $dbh )
137
      );
138
      );
138
139
139
    my $num_with_matches = 0;
140
    my $num_with_matches = 0;
140
- 

Return to bug 10877