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

(-)a/C4/Breeding.pm (-5 / +7 lines)
Lines 315-323 sub _handle_one_result { Link Here
315
    my $raw= $zoomrec->raw();
315
    my $raw= $zoomrec->raw();
316
    my $marcrecord;
316
    my $marcrecord;
317
    if( $servhref->{servertype} eq 'sru' ) {
317
    if( $servhref->{servertype} eq 'sru' ) {
318
        $raw= MARC::Record->new_from_xml( $raw, $servhref->{encoding}, $servhref->{syntax} );
318
        $marcrecord= MARC::Record->new_from_xml( $raw, 'UTF-8',
319
            $servhref->{syntax} );
320
    } else {
321
        ($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values
319
    }
322
    }
320
    ($marcrecord) = MarcToUTF8Record($raw, C4::Context->preference('marcflavour'), $servhref->{encoding} // "iso-5426" ); #ignores charset return values
321
    SetUTF8Flag($marcrecord);
323
    SetUTF8Flag($marcrecord);
322
    my $error;
324
    my $error;
323
    ( $marcrecord, $error ) = _do_xslt_proc($marcrecord, $servhref, $xslh);
325
    ( $marcrecord, $error ) = _do_xslt_proc($marcrecord, $servhref, $xslh);
Lines 621-629 sub Z3950SearchAuth { Link Here
621
623
622
                            my ($charset_result, $charset_errors);
624
                            my ($charset_result, $charset_errors);
623
                            if( $servers[$k]->{servertype} eq 'sru' ) {
625
                            if( $servers[$k]->{servertype} eq 'sru' ) {
624
                                $marcdata = MARC::Record->new_from_xml( $marcdata, $encoding[$k], $servers[$k]->{syntax} );
626
                                $marcrecord = MARC::Record->new_from_xml( $marcdata, 'UTF-8', $servers[$k]->{syntax} );
627
                            } else {
628
                                ( $marcrecord, $charset_result, $charset_errors ) = MarcToUTF8Record( $marcdata, $marc_type, $encoding[$k] );
625
                            }
629
                            }
626
                            ($marcrecord, $charset_result, $charset_errors)= MarcToUTF8Record($marcdata, $marc_type, $encoding[$k]);
627
                            my $heading;
630
                            my $heading;
628
                            my $heading_authtype_code;
631
                            my $heading_authtype_code;
629
                            $heading_authtype_code = GuessAuthTypeCode($marcrecord);
632
                            $heading_authtype_code = GuessAuthTypeCode($marcrecord);
630
- 

Return to bug 19436