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

(-)a/C4/Search.pm (-5 / +14 lines)
Lines 31-36 use C4::Branch; Link Here
31
use C4::Reserves;    # GetReserveStatus
31
use C4::Reserves;    # GetReserveStatus
32
use C4::Debug;
32
use C4::Debug;
33
use C4::Charset;
33
use C4::Charset;
34
use Carp;
35
use Encode;
34
use YAML;
36
use YAML;
35
use URI::Escape;
37
use URI::Escape;
36
use Business::ISBN;
38
use Business::ISBN;
Lines 484-490 sub getRecords { Link Here
484
                    # not an index scan
486
                    # not an index scan
485
                    else {
487
                    else {
486
                        $record = $results[ $i - 1 ]->record($j)->raw();
488
                        $record = $results[ $i - 1 ]->record($j)->raw();
487
                        utf8::decode( $record );
489
                        eval { $record = decode( 'UTF-8', $record, Encode::FB_CROAK ); } ;
490
                        if ( $@ ) { carp "Error decoding $record: $@" };
488
491
489
                        # warn "RECORD $j:".$record;
492
                        # warn "RECORD $j:".$record;
490
                        $results_hash->{'RECORDS'}[$j] = $record;
493
                        $results_hash->{'RECORDS'}[$j] = $record;
Lines 502-508 sub getRecords { Link Here
502
                        for ( my $j = 0 ; $j < $jmax ; $j++ ) {
505
                        for ( my $j = 0 ; $j < $jmax ; $j++ ) {
503
                            my $render_record =
506
                            my $render_record =
504
                              $results[ $i - 1 ]->record($j)->render();
507
                              $results[ $i - 1 ]->record($j)->render();
505
                            utf8::decode($render_record);
508
                            eval { $render_record = decode( 'UTF-8', $render_record,
509
                                                            Encode::FB_CROAK); };
510
                            if ( $@ ) { carp "Error decoding $render_record: $@" };
511
506
                            my @used_datas = ();
512
                            my @used_datas = ();
507
                            foreach my $tag ( @{ $facet->{tags} } ) {
513
                            foreach my $tag ( @{ $facet->{tags} } ) {
508
514
Lines 716-722 sub pazGetRecords { Link Here
716
        for (my $i = 0; $i < $count; $i++) {
722
        for (my $i = 0; $i < $count; $i++) {
717
            # FIXME -- may need to worry about diacritics here
723
            # FIXME -- may need to worry about diacritics here
718
            my $rec = $paz->record($recid, $i);
724
            my $rec = $paz->record($recid, $i);
719
            utf8::decode( $rec );
725
            eval { $rec = decode( 'UTF-8', $rec, Encode::FB_CROAK ); };
726
            if ( $@ ) { carp "Error decoding $rec: $@" };
720
            push @{ $result_group->{'RECORDS'} }, $rec;
727
            push @{ $result_group->{'RECORDS'} }, $rec;
721
        }
728
        }
722
729
Lines 1751-1757 sub searchResults { Link Here
1751
                            my $subfieldvalue = $repl[$i];
1758
                            my $subfieldvalue = $repl[$i];
1752
1759
1753
                            if (! utf8::is_utf8($subfieldvalue)) {
1760
                            if (! utf8::is_utf8($subfieldvalue)) {
1754
                                utf8::decode($subfieldvalue);
1761
                                eval {
1762
                                    $subfieldvalue = decode('UTF-8',$subfieldvalue,
1763
                                                            Encode::FB_CROAK); };
1764
                                if ( $@ ) { carp "Error decoding $subfieldvalue: $@" };
1755
                            }
1765
                            }
1756
1766
1757
                             $newline =~ s/\[$tag\]/$subfieldvalue/g;
1767
                             $newline =~ s/\[$tag\]/$subfieldvalue/g;
1758
- 

Return to bug 10068