Attachment #158340 for bug #33749

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

Lines 35-40 use Koha::Authority::MergeRequests; Link Here

(-)a/C4/AuthoritiesMarc.pm (-1 / +3 lines)
35	use Koha::Authority::Types;	35	use Koha::Authority::Types;
36	use Koha::Authority;	36	use Koha::Authority;
37	use Koha::Libraries;	37	use Koha::Libraries;
		38	use Koha::RecordProcessor;
38	use Koha::SearchEngine;	39	use Koha::SearchEngine;
39	use Koha::SearchEngine::Indexer;	40	use Koha::SearchEngine::Indexer;
40	use Koha::SearchEngine::Search;	41	use Koha::SearchEngine::Search;
Lines 659-665 sub AddAuthority { Link Here
659	}	660	}
660		661
661	if ( C4::Context->preference('StripWhitespaceChars') ) {	662	if ( C4::Context->preference('StripWhitespaceChars') ) {
662	$record = Koha::MetadataRecord::stripWhitespaceChars( $record );	663	my $p = Koha::RecordProcessor->new({ filters => qw(TrimFields) });
		664	$p->process( $record );
663	}	665	}
664		666
665	# Save record into auth_header, update 001	667	# Save record into auth_header, update 001




use Koha::ItemTypes;
use Koha::MarcOverlayRules;
use Koha::Plugins;
use Koha::RecordProcessor;
use Koha::SearchEngine;
use Koha::SearchEngine::Indexer;
use Koha::Libraries;
use Koha::Util::MARC;
use Koha::MetadataRecord;

=head1 NAME


    }

    if ( C4::Context->preference('StripWhitespaceChars') ) {
        my $p = Koha::RecordProcessor->new({ filters => qw(TrimFields) });
        $p->process( $record );
    }

    my $metadata = {




    }
}

=head2 stripWhitespaceChars

    $record = Koha::MetadataRecord::stripWhitespaceChars( $record );

Strip leading and trailing whitespace characters from input fields.

=cut

sub stripWhitespaceChars {
    my ( $record ) = @_;

    foreach my $field ( $record->fields ) {
        unless ( $field->is_control_field ) {
            foreach my $subfield ( $field->subfields ) {
                my $key = $subfield->[0];
                my $value = $subfield->[1];
                $value =~ s/[\n\r]+/ /g;
                $value =~ s/^\s+|\s+$//g;
                $field->add_subfields( $key => $value ); # add subfield to the end of the subfield list
                $field->delete_subfield( pos => 0 ); # delete the subfield at the top of the subfield list
            }
        }
    }

    return $record;
}

1;





use Modern::Perl;

use Test::More tests => 5;
use Test::Warn;

use Koha::RecordProcessor;


    is( $metadata_record, undef, 'record object mandatory')
};

subtest "stripWhitespaceChars() tests" => sub {
    plan tests => 2;

    # Test default values with a MARC::Record record
    my $record = MARC::Record->new();

    $record->add_fields(
        [ '001', '1234' ],
        [ '150', ' ', ' ', a => 'Test' ],
        [ '520', ' ', ' ', a => "This is\na test!\t" ],
        [ '521', ' ', ' ', a => "This is a\t test!\t" ],
    );

    my $p = Koha::RecordProcessor->new({ filters => ['TrimFields'] });
    $p->process( $record );

    my $get520a = $record->subfield('520','a');
    is( $get520a, "This is a test!", "Whitespace characters are appropriately stripped or replaced with spaces" );

    my $get521a = $record->subfield('521','a');
    is( $get521a, "This is a\t test!", "Trailing tabs are stripped while inner tabs are kept" );
};




    );
};

subtest "'TrimFields' filter tests" => sub {

    plan tests => 2;

    # Test default values with a MARC::Record record
    my $record = MARC::Record->new();

    $record->add_fields(
        [ '001', '1234' ],
        [ '150', ' ', ' ', a => 'Test' ],
        [ '520', ' ', ' ', a => "This is\na test!\t" ],
        [ '521', ' ', ' ', a => "This is a\t test!\t" ],
    );

    my $p = Koha::RecordProcessor->new({ filters => ['TrimFields'] });
    $p->process( $record );

    my $get520a = $record->subfield('520','a');
    is( $get520a, "This is a test!", "Whitespace characters are appropriately stripped or replaced with spaces" );

    my $get521a = $record->subfield('521','a');
    is( $get521a, "This is a\t test!", "Trailing tabs are stripped while inner tabs are kept" );
};

done_testing();
- 

Return to bug 33749

Lines 111-121 use Koha::Holds; Link Here

(-)a/C4/Biblio.pm (-2 / +3 lines)
111	use Koha::ItemTypes;	111	use Koha::ItemTypes;
112	use Koha::MarcOverlayRules;	112	use Koha::MarcOverlayRules;
113	use Koha::Plugins;	113	use Koha::Plugins;
		114	use Koha::RecordProcessor;
114	use Koha::SearchEngine;	115	use Koha::SearchEngine;
115	use Koha::SearchEngine::Indexer;	116	use Koha::SearchEngine::Indexer;
116	use Koha::Libraries;	117	use Koha::Libraries;
117	use Koha::Util::MARC;	118	use Koha::Util::MARC;
118	use Koha::MetadataRecord;
119		119
120	=head1 NAME	120	=head1 NAME
121		121
Lines 2841-2847 sub ModBiblioMarc { Link Here
2841	}	2841	}
2842		2842
2843	if ( C4::Context->preference('StripWhitespaceChars') ) {	2843	if ( C4::Context->preference('StripWhitespaceChars') ) {
2844	$record = Koha::MetadataRecord::stripWhitespaceChars( $record );	2844	my $p = Koha::RecordProcessor->new({ filters => qw(TrimFields) });
		2845	$p->process( $record );
2845	}	2846	}
2846		2847
2847	my $metadata = {	2848	my $metadata = {

Lines 108-138 sub createMergeHash { Link Here

(-)a/Koha/MetadataRecord.pm (-27 lines)
108	}	108	}
109	}	109	}
110		110
111	=head2 stripWhitespaceChars
112
113	$record = Koha::MetadataRecord::stripWhitespaceChars( $record );
114
115	Strip leading and trailing whitespace characters from input fields.
116
117	=cut
118
119	sub stripWhitespaceChars {
120	my ( $record ) = @_;
121
122	foreach my $field ( $record->fields ) {
123	unless ( $field->is_control_field ) {
124	foreach my $subfield ( $field->subfields ) {
125	my $key = $subfield->[0];
126	my $value = $subfield->[1];
127	$value =~ s/[\n\r]+/ /g;
128	$value =~ s/^\s+\|\s+$//g;
129	$field->add_subfields( $key => $value ); # add subfield to the end of the subfield list
130	$field->delete_subfield( pos => 0 ); # delete the subfield at the top of the subfield list
131	}
132	}
133	}
134
135	return $record;
136	}
137
138	1;	111	1;

Lines 19-25 Link Here

(-)a/t/Koha_MetadataRecord.t (-24 / +1 lines)
19		19
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Test::More tests => 6;	22	use Test::More tests => 5;
23	use Test::Warn;	23	use Test::Warn;
24		24
25	use Koha::RecordProcessor;	25	use Koha::RecordProcessor;
Lines 143-168 subtest "new() tests" => sub { Link Here
143		143
144	is( $metadata_record, undef, 'record object mandatory')	144	is( $metadata_record, undef, 'record object mandatory')
145	};	145	};
146
147	subtest "stripWhitespaceChars() tests" => sub {
148	plan tests => 2;
149
150	# Test default values with a MARC::Record record
151	my $record = MARC::Record->new();
152
153	$record->add_fields(
154	[ '001', '1234' ],
155	[ '150', ' ', ' ', a => 'Test' ],
156	[ '520', ' ', ' ', a => "This is\na test!\t" ],
157	[ '521', ' ', ' ', a => "This is a\t test!\t" ],
158	);
159
160	my $p = Koha::RecordProcessor->new({ filters => ['TrimFields'] });
161	$p->process( $record );
162
163	my $get520a = $record->subfield('520','a');
164	is( $get520a, "This is a test!", "Whitespace characters are appropriately stripped or replaced with spaces" );
165
166	my $get521a = $record->subfield('521','a');
167	is( $get521a, "This is a\t test!", "Trailing tabs are stripped while inner tabs are kept" );
168	};

Lines 203-206 subtest 'options() tests' => sub { Link Here

(-)a/t/RecordProcessor.t (-1 / +24 lines)
203	);	203	);
204	};	204	};
205		205
		206	subtest "'TrimFields' filter tests" => sub {
		207
		208	plan tests => 2;
		209
		210	# Test default values with a MARC::Record record
		211	my $record = MARC::Record->new();
		212
		213	$record->add_fields(
		214	[ '001', '1234' ],
		215	[ '150', ' ', ' ', a => 'Test' ],
		216	[ '520', ' ', ' ', a => "This is\na test!\t" ],
		217	[ '521', ' ', ' ', a => "This is a\t test!\t" ],
		218	);
		219
		220	my $p = Koha::RecordProcessor->new({ filters => ['TrimFields'] });
		221	$p->process( $record );
		222
		223	my $get520a = $record->subfield('520','a');
		224	is( $get520a, "This is a test!", "Whitespace characters are appropriately stripped or replaced with spaces" );
		225
		226	my $get521a = $record->subfield('521','a');
		227	is( $get521a, "This is a\t test!", "Trailing tabs are stripped while inner tabs are kept" );
		228	};
		229
206	done_testing();	230	done_testing();
207	-