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

(-)a/C4/AuthoritiesMarc.pm (-2 / +2 lines)
Lines 662-669 sub AddAuthority { Link Here
662
            foreach my $subfield ( $field->subfields ) {
662
            foreach my $subfield ( $field->subfields ) {
663
                my $key = $subfield->[0];
663
                my $key = $subfield->[0];
664
                my $value = $subfield->[1];
664
                my $value = $subfield->[1];
665
                $value =~ s/^\s+|\s+$|^\t+|\t+$|^\n+|\n+$|^\r+|\r+$//g;
665
                $value =~ s/[\n\r]+/ /g;
666
                $value =~ s/\n+|\r+/ /g;
666
                $value =~ s/^\s+|\s+$|^\t+|\t+$//g;
667
                $field->update( $key => $value );
667
                $field->update( $key => $value );
668
            }
668
            }
669
        }
669
        }
(-)a/C4/Biblio.pm (-2 / +2 lines)
Lines 2756-2763 sub ModBiblioMarc { Link Here
2756
            foreach my $subfield ( $field->subfields ) {
2756
            foreach my $subfield ( $field->subfields ) {
2757
                my $key = $subfield->[0];
2757
                my $key = $subfield->[0];
2758
                my $value = $subfield->[1];
2758
                my $value = $subfield->[1];
2759
                $value =~ s/^\s+|\s+$|^\t+|\t+$|^\n+|\n+$|^\r+|\r+$//g;
2759
                $value =~ s/[\n\r]+/ /g;
2760
                $value =~ s/\n+|\r+/ /g;
2760
                $value =~ s/^\s+|\s+$|^\t+|\t+$//g;
2761
                $field->update( $key => $value );
2761
                $field->update( $key => $value );
2762
            }
2762
            }
2763
        }
2763
        }
(-)a/t/db_dependent/Biblio/ModBiblioMarc.t (-7 / +6 lines)
Lines 50-73 subtest "Check MARC field length calculation" => sub { Link Here
50
subtest "StripWhitespaceChars tests" => sub {
50
subtest "StripWhitespaceChars tests" => sub {
51
    plan tests => 3;
51
    plan tests => 3;
52
52
53
    t::lib::Mocks->mock_preference('marcflavour', 'MARC21');
53
    t::lib::Mocks::mock_preference('marcflavour', 'MARC21');
54
    t::lib::Mocks->mock_preference('StripWhitespaceChars', 0);
54
    t::lib::Mocks::mock_preference('StripWhitespaceChars', 0);
55
55
56
    my $biblio = t::lib::TestBuilder->new->build_sample_biblio;
56
    my $biblio = t::lib::TestBuilder->new->build_sample_biblio;
57
    my $record = MARC::Record->new;
57
    my $record = MARC::Record->new;
58
    $record->append_fields(
58
    $record->append_fields(
59
        MARC::Field->new( '245', '', '', a => "  My title\n" ),
59
        MARC::Field->new( '245', '', '', a => "  My\ntitle\n" ),
60
    );
60
    );
61
61
62
    my $title = $record->title;
62
    my $title = $record->title;
63
    is( $title, "  My title\n", 'Title has whitespace characters' );
63
    is( $title, "  My\ntitle\n", 'Title has whitespace characters' );
64
64
65
    C4::Biblio::ModBiblioMarc( $record, $biblio->biblionumber );
65
    C4::Biblio::ModBiblioMarc( $record, $biblio->biblionumber );
66
    my $savedrec = C4::Biblio::GetMarcBiblio({ biblionumber => $biblio->biblionumber });
66
    my $savedrec = C4::Biblio::GetMarcBiblio({ biblionumber => $biblio->biblionumber });
67
    my $savedtitle = $savedrec->title;
67
    my $savedtitle = $savedrec->title;
68
    is( $savedtitle, "  My title\n", "Title still has whitespace characters because StripWhitespaceChars is disabled" );
68
    is( $savedtitle, "  My\ntitle\n", "Title still has whitespace characters because StripWhitespaceChars is disabled" );
69
69
70
    t::lib::Mocks->mock_preference('StripWhitespaceChars', 1);
70
    t::lib::Mocks::mock_preference('StripWhitespaceChars', 1);
71
71
72
    C4::Biblio::ModBiblioMarc( $record, $biblio->biblionumber );
72
    C4::Biblio::ModBiblioMarc( $record, $biblio->biblionumber );
73
    my $amendedrec = C4::Biblio::GetMarcBiblio({ biblionumber => $biblio->biblionumber });
73
    my $amendedrec = C4::Biblio::GetMarcBiblio({ biblionumber => $biblio->biblionumber });
74
- 

Return to bug 30358