From cc8f3dc1cc046ecd7d53349091fbba864dfb91c9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 6 Apr 2018 17:16:30 -0300 Subject: [PATCH] Bug 20540: Fix TransformHtmlToXml if last tag is empty This bug has been found during testing bug 19289. In some conditions C4::Biblio::TransformHtmlToXml will generate a malformed XML structure. The last can be duplicated. For instance, if a call like: my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values ); with the last value of @field_values is empty, it will return: l k k k k k Which will result later in the following error: :23: parser error : Opening and ending tag mismatch: record line 6 and datafield ^ :24: parser error : Opening and ending tag mismatch: collection line 2 and record ^ :25: parser error : Extra content at the end of the document Test plan: You can test it along with bug 19289 and confirm that it fixes the problem raised on bug 19289 comment 30 Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart --- C4/Biblio.pm | 8 +++++++- t/Biblio/TransformHtmlToXml.t | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 91707fdc61..5749bbae88 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -2263,6 +2263,7 @@ sub TransformHtmlToXml { my $prevtag = -1; my $first = 1; my $j = -1; + my $close_last_tag; for ( my $i = 0 ; $i < @$tags ; $i++ ) { if ( C4::Context->preference('marcflavour') eq 'UNIMARC' and @$tags[$i] eq "100" and @$subfields[$i] eq "a" ) { @@ -2283,6 +2284,7 @@ sub TransformHtmlToXml { @$values[$i] =~ s/'/'/g; if ( ( @$tags[$i] ne $prevtag ) ) { + $close_last_tag = 0; $j++ unless ( @$tags[$i] eq "" ); my $indicator1 = eval { substr( @$indicator[$j], 0, 1 ) }; my $indicator2 = eval { substr( @$indicator[$j], 1, 1 ) }; @@ -2301,6 +2303,7 @@ sub TransformHtmlToXml { $xml .= "\n"; $xml .= "@$values[$i]\n"; $first = 0; + $close_last_tag = 1; } else { $first = 1; } @@ -2320,6 +2323,7 @@ sub TransformHtmlToXml { $xml .= "\n"; $xml .= "@$values[$i]\n"; $first = 0; + $close_last_tag = 1; } } } @@ -2339,13 +2343,14 @@ sub TransformHtmlToXml { if ($first) { $xml .= "\n"; $first = 0; + $close_last_tag = 1; } $xml .= "@$values[$i]\n"; } } $prevtag = @$tags[$i]; } - $xml .= "\n" if $xml =~ m/preference('marcflavour') eq 'UNIMARC' and !$unimarc_and_100_exist ) { # warn "SETTING 100 for $auth_type"; @@ -2362,6 +2367,7 @@ sub TransformHtmlToXml { } $xml .= "\n"; $xml .= MARC::File::XML::footer(); + use Data::Printer colored => 1; warn p $xml; return $xml; } diff --git a/t/Biblio/TransformHtmlToXml.t b/t/Biblio/TransformHtmlToXml.t index c95c120422..bbbadd249f 100644 --- a/t/Biblio/TransformHtmlToXml.t +++ b/t/Biblio/TransformHtmlToXml.t @@ -33,14 +33,14 @@ sub run_tests { my ( $tags, $subfields ); if ( $marc_flavour eq 'UNIMARC' ) { - $tags= [ '001', '600', '200', '200' ]; - $subfields = [ '', 'a', 'a', 'c' ]; + $tags= [ '001', '600', '200', '200', '400' ]; + $subfields = [ '', 'a', 'a', 'c', 'a' ]; } else { - $tags= [ '001', '100', '245', '245' ]; - $subfields = [ '', 'a', 'a', 'c' ]; + $tags= [ '001', '100', '245', '245', '400' ]; + $subfields = [ '', 'a', 'a', 'c', 'a' ]; } - my $values = [ '12345', 'author', 'title', 'resp' ]; - my $ind = [ ' ', '00', ' 9', ' ' ]; + my $values = [ '12345', 'author', 'title', 'resp', '' ]; + my $ind = [ ' ', '00', ' 9', ' ', ' ' ]; my $xml = TransformHtmlToXml( $tags, $subfields, $values, $ind, undef, $marc_flavour ); my $xmlh = XML::Simple->new->XMLin( $xml ); -- 2.39.5