From 99c68157c97b4362e8c5a83c1d19e67d66fc2b3f Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Thu, 7 Apr 2022 05:50:46 +0000 Subject: [PATCH] Bug 30358: (follow-up) Inner newlines should be replaced with a space Signed-off-by: David Nind Signed-off-by: Kyle M Hall --- C4/AuthoritiesMarc.pm | 3 ++- C4/Biblio.pm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index 36901861fa..ce288efa2a 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -663,7 +663,8 @@ sub AddAuthority { foreach my $subfield ( $field->subfields ) { my $key = $subfield->[0]; my $value = $subfield->[1]; - $value =~ s/^\s+|\s+$|\n+|\r+|^\t+|\t+$//g; + $value =~ s/^\s+|\s+$|^\t+|\t+$|^\n+|\n+$|^\r+|\r+$//g; + $value =~ s/\n+|\r+/ /g; $field->update( $key => $value ); } } diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 6e3053f0d3..02f5c624ed 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -2816,7 +2816,8 @@ sub ModBiblioMarc { foreach my $subfield ( $field->subfields ) { my $key = $subfield->[0]; my $value = $subfield->[1]; - $value =~ s/^\s+|\s+$|\n+|\r+|^\t+|\t+$//g; + $value =~ s/^\s+|\s+$|^\t+|\t+$|^\n+|\n+$|^\r+|\r+$//g; + $value =~ s/\n+|\r+/ /g; $field->update( $key => $value ); } } -- 2.30.2