Attachment 12732 Details for Bug 8610 – Signed patch

[patch] Signed patch

patch.txt (text/plain), 3.53 KB, created by Marcel de Rooy on 2012-10-08 13:16:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2012-10-08 13:16:08 UTC

Size: 3.53 KB

patch

obsolete

>From 06895e6c589c81392445d45bce084ac372fb1292 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Fr=C3=A9d=C3=A9rick=20Capovilla?=
> <frederick.capovilla@libeo.com>
>Date: Wed, 28 Sep 2011 13:58:14 -0400
>Subject: [PATCH] Normalize records imported from Z39.50 servers.
>Content-Type: text/plain; charset="utf-8"
>
>Some Z39.50 server may use the MARC-8 encoding, which uses separated
>diacritics. By forcing a normalization, all imported records will have
>combined diacritics.
>
>Records with separated diacritics might not show up in Zebra searches if
>the search terms use accented characters.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> 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(-)
>
>diff --git a/C4/Breeding.pm b/C4/Breeding.pm
>index 19bb7e2..9e8834a 100644
>--- a/C4/Breeding.pm
>+++ b/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();
>diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm
>index a655f29..c85ee09 100644
>--- a/C4/ImportBatch.pm
>+++ b/C4/ImportBatch.pm
>@@ -382,6 +382,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++;
>             if ($record_type eq 'biblio') {
>                 $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $encoding, int(rand(99999)), 0);
>diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
>index 9dc8b6e..4f0be65 100755
>--- a/acqui/z3950_search.pl
>+++ b/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
>diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
>index 5e22636..fe07a7d 100755
>--- a/cataloguing/z3950_search.pl
>+++ b/cataloguing/z3950_search.pl
>@@ -249,6 +249,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
>-- 
>1.7.7.6
>

Actions: View | Diff | Splinter Review

Attachments on bug 8610: 11512 | 12732