From: dbs Date: Sun, 26 Apr 2009 01:25:08 +0000 (+0000) Subject: Normalize to composed Unicode characters X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=322c7c9bd6856259f414cd48037172abc662e154;p=Evergreen.git Normalize to composed Unicode characters Some browsers (like Firefox) do a better job of displaying composed Unicode characters git-svn-id: svn://svn.open-ils.org/ILS/trunk@12985 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/extras/import/marc2are.pl b/Open-ILS/src/extras/import/marc2are.pl index 8949dfcb0c..5da337c460 100755 --- a/Open-ILS/src/extras/import/marc2are.pl +++ b/Open-ILS/src/extras/import/marc2are.pl @@ -69,7 +69,7 @@ while ( try { $rec = $batch->next } otherwise { $rec = -1 } ) { $xml =~ s/^<\?xml.+\?\s*>//go; $xml =~ s/>\s+entityize($xml,'D'); + $xml = OpenILS::Application::AppUtils->entityize($xml); $xml =~ s/[\x00-\x1f]//go; my $bib = new Fieldmapper::authority::record_entry; diff --git a/Open-ILS/src/extras/import/marc2bre.pl b/Open-ILS/src/extras/import/marc2bre.pl index e0e355652f..b0a85cbc25 100755 --- a/Open-ILS/src/extras/import/marc2bre.pl +++ b/Open-ILS/src/extras/import/marc2bre.pl @@ -199,10 +199,10 @@ PROCESS: while ( try { $rec = $batch->next } otherwise { $rec = -1 } ) { # catch problem ids if (!$id) { - warn "\n!!! Record $count has missing or invalid id field $id_field, assinging new id.\n"; + warn "\n!!! Record $count has missing or invalid id field $id_field, assigning new id.\n"; $id = ''; } elsif (exists $used_recids{$id}) { - warn "\n!!! Record $count has a duplicate id in field $id_field, assinging new id.\n"; + warn "\n!!! Record $count has a duplicate id in field $id_field, assigning new id.\n"; $id = ''; } else { $used_recids{$id} = 1; @@ -261,7 +261,7 @@ PROCESS: while ( try { $rec = $batch->next } otherwise { $rec = -1 } ) { $xml =~ s/^<\?xml.+\?\s*>//go; $xml =~ s/>\s+entityize($xml,'D'); + $xml = OpenILS::Application::AppUtils->entityize($xml); $xml =~ s/[\x00-\x1f]//go; my $bib = new Fieldmapper::biblio::record_entry;