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

(-)a/C4/Record.pm (-3 / +3 lines)
Lines 702-714 sub marc2bibtex { Link Here
702
	    author    => $author,
702
	    author    => $author,
703
	    title     => $record->subfield("245", "a") || "",
703
	    title     => $record->subfield("245", "a") || "",
704
	    editor    => $record->subfield("260", "f") || "",
704
	    editor    => $record->subfield("260", "f") || "",
705
	    publisher => $record->subfield("260", "b") || "",
705
        publisher => $record->subfield("264", "b") || $record->subfield("260", "b") || "",
706
	    year      => $record->subfield("260", "c") || $record->subfield("260", "g") || "",
706
        year      => $record->subfield("264", "c") || $record->subfield("260", "c") || $record->subfield("260", "g") || "",
707
707
708
	    # Optional
708
	    # Optional
709
	    # unimarc to marc21 specification says not to convert 200$v to marc21
709
	    # unimarc to marc21 specification says not to convert 200$v to marc21
710
	    series  =>  $record->subfield("490", "a") || "",
710
	    series  =>  $record->subfield("490", "a") || "",
711
	    address =>  $record->subfield("260", "a") || "",
711
        address =>  $record->subfield("264", "a") || $record->subfield("260", "a") || "",
712
	    edition =>  $record->subfield("250", "a") || "",
712
	    edition =>  $record->subfield("250", "a") || "",
713
	    note    =>  $record->subfield("500", "a") || "",
713
	    note    =>  $record->subfield("500", "a") || "",
714
	    url     =>  $record->subfield("856", "u") || ""
714
	    url     =>  $record->subfield("856", "u") || ""
(-)a/C4/Ris.pm (-4 / +8 lines)
Lines 209-215 sub marc2ris { Link Here
209
	    &print_pubinfo($record->field('210'));
209
	    &print_pubinfo($record->field('210'));
210
	}
210
	}
211
	else { ## marc21, ukmarc
211
	else { ## marc21, ukmarc
212
	    &print_pubinfo($record->field('260'));
212
            if ($record->field('264')) {
213
                 &print_pubinfo($record->field('264'));
214
            }
215
            else {
216
            &print_pubinfo($record->field('260'));
217
            }
213
	}
218
	}
214
219
215
	## 6XX fields contain KW candidates. We add all of them to a
220
	## 6XX fields contain KW candidates. We add all of them to a
Lines 252-258 sub marc2ris { Link Here
252
	elsif ($intype eq "ukmarc") {
257
	elsif ($intype eq "ukmarc") {
253
	    foreach ('500', '501', '502', '503', '504', '505', '506', '508', '514', '515', '516', '521', '524', '525', '528', '530', '531', '532', '533', '534', '535', '537', '538', '540', '541', '542', '544', '554', '555', '556', '557', '561', '563', '580', '583', '584', '586') {
258
	    foreach ('500', '501', '502', '503', '504', '505', '506', '508', '514', '515', '516', '521', '524', '525', '528', '530', '531', '532', '533', '534', '535', '537', '538', '540', '541', '542', '544', '554', '555', '556', '557', '561', '563', '580', '583', '584', '586') {
254
		&pool_subx(\@notepool, $_, $record->field($_));
259
		&pool_subx(\@notepool, $_, $record->field($_));
255
	    }
260
        }
256
	}
261
	}
257
	else { ## assume marc21
262
	else { ## assume marc21
258
	    foreach ('500', '501', '502', '504', '505', '506', '507', '508', '510', '511', '513', '514', '515', '516', '518', '521', '522', '524', '525', '526', '530', '533', '534', '535') {
263
	    foreach ('500', '501', '502', '504', '505', '506', '507', '508', '510', '511', '513', '514', '515', '516', '518', '521', '522', '524', '525', '526', '530', '533', '534', '535') {
Lines 642-648 sub print_pubinfo { Link Here
642
    my($pubinfofield) = @_;
647
    my($pubinfofield) = @_;
643
648
644
    if (!$pubinfofield) {
649
    if (!$pubinfofield) {
645
	print "<marc>no publication information found (260)\r\n" if $marcprint;
650
    print "<marc>no publication information found (260/264)\r\n" if $marcprint;
646
	warn("no publication information found") if $marcprint;
651
	warn("no publication information found") if $marcprint;
647
    }
652
    }
648
    else {
653
    else {
649
- 

Return to bug 11066