@@ -, +, @@ --- C4/Breeding.pm | 3 +++ C4/ImportBatch.pm | 4 ++++ acqui/z3950_search.pl | 4 ++++ cataloguing/z3950_search.pl | 4 ++++ 4 files changed, 15 insertions(+), 0 deletions(-) --- a/C4/Breeding.pm +++ a/C4/Breeding.pm @@ -94,6 +94,9 @@ sub ImportBreeding { ($marcrecord, $charset_result, $charset_errors) = MarcToUTF8Record($marcarray[$i]."\x1D", C4::Context->preference("marcflavour"), $encoding); + # Normalize the record so it doesn't have separated diacritics + SetUTF8Flag($marcrecord); + # warn "$i : $marcarray[$i]"; # FIXME - currently this does nothing my @warnings = $marcrecord->warnings(); --- a/C4/ImportBatch.pm +++ a/C4/ImportBatch.pm @@ -337,6 +337,10 @@ sub BatchStageMarcRecords { if (scalar($marc_record->fields()) == 0) { push @invalid_records, $marc_blob; } else { + + # Normalize the record so it doesn't have separated diacritics + SetUTF8Flag($marc_record); + $num_valid++; $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $encoding, int(rand(99999)), 0); if ($parse_items) { --- a/acqui/z3950_search.pl +++ a/acqui/z3950_search.pl @@ -277,6 +277,10 @@ warn "query ".$query if $DEBUG; ## In HEAD i change everything to UTF-8 # In rel2_2 i am not sure what encoding is so no character conversion is done here ##Add necessary encoding changes to here -TG + + # Normalize the record so it doesn't have separated diacritics + SetUTF8Flag($marcrecord); + my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" ); $oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn}; # pad | and ( with spaces to allow line breaks in the HTML --- a/cataloguing/z3950_search.pl +++ a/cataloguing/z3950_search.pl @@ -245,6 +245,10 @@ warn "query ".$query if $DEBUG; ## In HEAD i change everything to UTF-8 # In rel2_2 i am not sure what encoding is so no character conversion is done here ##Add necessary encoding changes to here -TG + + # Normalize the record so it doesn't have separated diacritics + SetUTF8Flag($marcrecord); + my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" ); $oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn}; # pad | and ( with spaces to allow line breaks in the HTML --