|
Lines 296-303
sub _handle_one_result {
Link Here
|
| 296 |
my $raw= $zoomrec->raw(); |
296 |
my $raw= $zoomrec->raw(); |
| 297 |
my $marcrecord; |
297 |
my $marcrecord; |
| 298 |
if( $servhref->{servertype} eq 'sru' ) { |
298 |
if( $servhref->{servertype} eq 'sru' ) { |
| 299 |
$marcrecord= MARC::Record->new_from_xml( $raw, 'UTF-8', |
299 |
$marcrecord= MARC::Record->new_from_xml( $raw, 'UTF-8', C4::Context->preference('marcflavour') ); |
| 300 |
$servhref->{syntax} ); |
300 |
$record->encoding('UTF-8'); |
| 301 |
} else { |
301 |
} else { |
| 302 |
($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values |
302 |
($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values |
| 303 |
} |
303 |
} |
|
Lines 609-615
sub Z3950SearchAuth {
Link Here
|
| 609 |
|
609 |
|
| 610 |
my ($charset_result, $charset_errors); |
610 |
my ($charset_result, $charset_errors); |
| 611 |
if( $servers[$k]->{servertype} eq 'sru' ) { |
611 |
if( $servers[$k]->{servertype} eq 'sru' ) { |
| 612 |
$marcrecord = MARC::Record->new_from_xml( $marcdata, 'UTF-8', $servers[$k]->{syntax} ); |
612 |
$marcrecord = MARC::File::XML->new_from_xml( $marcdata, 'UTF-8', $marc_type ); |
|
|
613 |
$record->encoding('UTF-8'); |
| 613 |
} else { |
614 |
} else { |
| 614 |
( $marcrecord, $charset_result, $charset_errors ) = MarcToUTF8Record( $marcdata, $marc_type, $encoding[$k] ); |
615 |
( $marcrecord, $charset_result, $charset_errors ) = MarcToUTF8Record( $marcdata, $marc_type, $encoding[$k] ); |
| 615 |
} |
616 |
} |
| 616 |
- |
|
|