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

(-)a/C4/ImportBatch.pm (-4 / +7 lines)
Lines 210-216 sub ModBiblioInBatch { Link Here
210
=head2 BatchStageMarcRecords
210
=head2 BatchStageMarcRecords
211
211
212
  ($batch_id, $num_records, $num_items, @invalid_records) = 
212
  ($batch_id, $num_records, $num_items, @invalid_records) = 
213
    BatchStageMarcRecords($marc_flavor, $marc_records, $file_name, 
213
    BatchStageMarcRecords($encoding, $marc_records, $file_name, 
214
                          $comments, $branch_code, $parse_items,
214
                          $comments, $branch_code, $parse_items,
215
                          $leave_as_staging, 
215
                          $leave_as_staging, 
216
                          $progress_interval, $progress_callback);
216
                          $progress_interval, $progress_callback);
Lines 218-224 sub ModBiblioInBatch { Link Here
218
=cut
218
=cut
219
219
220
sub  BatchStageMarcRecords {
220
sub  BatchStageMarcRecords {
221
    my $marc_flavor = shift;
221
    my $encoding = shift;
222
    my $marc_records = shift;
222
    my $marc_records = shift;
223
    my $file_name = shift;
223
    my $file_name = shift;
224
    my $comments = shift;
224
    my $comments = shift;
Lines 258-270 sub BatchStageMarcRecords { Link Here
258
            &$progress_callback($rec_num);
258
            &$progress_callback($rec_num);
259
        }
259
        }
260
        my ($marc_record, $charset_guessed, $char_errors) =
260
        my ($marc_record, $charset_guessed, $char_errors) =
261
            MarcToUTF8Record($marc_blob, C4::Context->preference("marcflavour"));
261
            MarcToUTF8Record($marc_blob, C4::Context->preference("marcflavour"), $encoding);
262
263
        $encoding = $charset_guessed unless $encoding;
264
262
        my $import_record_id;
265
        my $import_record_id;
263
        if (scalar($marc_record->fields()) == 0) {
266
        if (scalar($marc_record->fields()) == 0) {
264
            push @invalid_records, $marc_blob;
267
            push @invalid_records, $marc_blob;
265
        } else {
268
        } else {
266
            $num_valid++;
269
            $num_valid++;
267
            $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $marc_flavor, int(rand(99999)), 0);
270
            $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $encoding, int(rand(99999)), 0);
268
            if ($parse_items) {
271
            if ($parse_items) {
269
                my @import_items_ids = AddItemsToImportBiblio($batch_id, $import_record_id, $marc_record, 0);
272
                my @import_items_ids = AddItemsToImportBiblio($batch_id, $import_record_id, $marc_record, 0);
270
                $num_items += scalar(@import_items_ids);
273
                $num_items += scalar(@import_items_ids);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt (-7 / +2 lines)
Lines 93-105 function CheckForm(f) { Link Here
93
		
93
		
94
	</li>
94
	</li>
95
	<li>
95
	<li>
96
		<label for="syntax">Character encoding: </label>
96
		<label for="encoding">Character encoding: </label>
97
        [% IF ( UNIMARC ) %]
97
            <select name="encoding" id="encoding"><option value="" selected="selected">Default</option><option value="utf8">UTF-8</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>
98
            <select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC" selected="selected">UNIMARC</option></select>
99
        [% ELSE %]
100
            <select name="syntax" id="syntax"><option value="MARC21" selected="selected">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
101
        [% END %]
102
		
103
	</li>
98
	</li>
104
</ol></fieldset>
99
</ol></fieldset>
105
  <fieldset class="rows">
100
  <fieldset class="rows">
(-)a/tools/stage-marc-import.pl (-5 / +4 lines)
Lines 55-61 my $nomatch_action = $input->param('nomatch_action'); Link Here
55
my $parse_items = $input->param('parse_items');
55
my $parse_items = $input->param('parse_items');
56
my $item_action = $input->param('item_action');
56
my $item_action = $input->param('item_action');
57
my $comments = $input->param('comments');
57
my $comments = $input->param('comments');
58
my $syntax = $input->param('syntax');
58
my $encoding = $input->param('encoding');
59
my ($template, $loggedinuser, $cookie)
59
my ($template, $loggedinuser, $cookie)
60
	= get_template_and_user({template_name => "tools/stage-marc-import.tmpl",
60
	= get_template_and_user({template_name => "tools/stage-marc-import.tmpl",
61
					query => $input,
61
					query => $input,
Lines 130-139 if ($completedJobID) { Link Here
130
    }
130
    }
131
131
132
    # FIXME branch code
132
    # FIXME branch code
133
    my ($batch_id, $num_valid, $num_items, @import_errors) = BatchStageMarcRecords($syntax, $marcrecord, $filename, 
133
    my ($batch_id, $num_valid, $num_items, @import_errors) = BatchStageMarcRecords($encoding, $marcrecord, $filename, $comments, '', $parse_items, 0, 50, staging_progress_callback($job, $dbh));
134
                                                                                   $comments, '', $parse_items, 0,
134
135
                                                                                   50, staging_progress_callback($job, $dbh));
136
    $dbh->commit();
135
    $dbh->commit();
136
137
    my $num_with_matches = 0;
137
    my $num_with_matches = 0;
138
    my $checked_matches = 0;
138
    my $checked_matches = 0;
139
    my $matcher_failed = 0;
139
    my $matcher_failed = 0;
140
- 

Return to bug 5859