From 70baa43f3baa222aff9d0ea5f5ce6d889f73a53c Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 20 Apr 2011 16:07:55 +0000 Subject: [PATCH] Always use BinaryEncodeing => "UTF-8" with MARC::File::XML git-svn-id: svn://svn.open-ils.org/ILS/trunk@20250 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/extras/import/direct_ingest.pl | 2 +- Open-ILS/src/extras/import/direct_loader.pl | 2 +- Open-ILS/src/extras/import/marcFilterDump.pl | 2 +- Open-ILS/src/extras/import/marc_add_ids | 2 +- Open-ILS/src/extras/marc2html | 2 +- Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm | 2 +- .../src/perlmods/lib/OpenILS/Application/Acq/Picklist.pm | 2 +- .../src/perlmods/lib/OpenILS/Application/Search/Z3950.pm | 6 +++++- .../lib/OpenILS/Application/Storage/Publisher/asset.pm | 2 +- Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm | 2 +- Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm | 2 +- Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm | 2 +- .../src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm | 2 +- Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm | 2 +- Open-ILS/src/support-scripts/marc_export.in | 2 +- Open-ILS/src/support-scripts/marc_stream_importer.pl | 2 +- 16 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Open-ILS/src/extras/import/direct_ingest.pl b/Open-ILS/src/extras/import/direct_ingest.pl index efda18351c..45df729332 100755 --- a/Open-ILS/src/extras/import/direct_ingest.pl +++ b/Open-ILS/src/extras/import/direct_ingest.pl @@ -21,7 +21,7 @@ use FileHandle; use Time::HiRes qw/time/; use Getopt::Long; use MARC::Batch; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); use MARC::Charset; MARC::Charset->ignore_errors(1); diff --git a/Open-ILS/src/extras/import/direct_loader.pl b/Open-ILS/src/extras/import/direct_loader.pl index 45f7a5637b..02c3f36691 100755 --- a/Open-ILS/src/extras/import/direct_loader.pl +++ b/Open-ILS/src/extras/import/direct_loader.pl @@ -21,7 +21,7 @@ use FileHandle; use Time::HiRes qw/time/; use Getopt::Long; use MARC::Batch; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); use MARC::Charset; MARC::Charset->ignore_errors(1); diff --git a/Open-ILS/src/extras/import/marcFilterDump.pl b/Open-ILS/src/extras/import/marcFilterDump.pl index ff2011a91b..a1d76c067c 100755 --- a/Open-ILS/src/extras/import/marcFilterDump.pl +++ b/Open-ILS/src/extras/import/marcFilterDump.pl @@ -2,7 +2,7 @@ use strict; use Error qw/:try/; use MARC::Batch; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); use XML::LibXML; use Getopt::Long; use encoding 'utf8'; diff --git a/Open-ILS/src/extras/import/marc_add_ids b/Open-ILS/src/extras/import/marc_add_ids index 963b6f5045..ac78c0444c 100755 --- a/Open-ILS/src/extras/import/marc_add_ids +++ b/Open-ILS/src/extras/import/marc_add_ids @@ -6,7 +6,7 @@ use warnings; use Getopt::Long; use MARC::Record; use MARC::Charset; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); use Error qw/:try/; MARC::Charset->assume_unicode(1); diff --git a/Open-ILS/src/extras/marc2html b/Open-ILS/src/extras/marc2html index f367c70680..67c28f8814 100755 --- a/Open-ILS/src/extras/marc2html +++ b/Open-ILS/src/extras/marc2html @@ -2,7 +2,7 @@ use Error qw/:try/; use MARC::Batch; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); use XML::LibXSLT; use XML::LibXML; use Unicode::Normalize; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm index f37f89375b..917b20f4b9 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm @@ -188,7 +188,7 @@ use OpenILS::Application::Cat::BibCommon; use OpenILS::Application::Cat::AssetCommon; use MARC::Record; use MARC::Batch; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); my $U = 'OpenILS::Application::AppUtils'; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Picklist.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Picklist.pm index 3780d933b3..eee578f9d9 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Picklist.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Picklist.pm @@ -13,7 +13,7 @@ use OpenILS::Application::AppUtils; use OpenSRF::Utils::Cache; use MARC::Record; use MARC::Batch; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); use MIME::Base64; use Digest::MD5 qw/md5_hex/; use OpenILS::Application::Acq::Financials; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm index 18884c6e38..a5cd5ca478 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm @@ -4,7 +4,8 @@ use base qw/OpenILS::Application/; use OpenILS::Utils::ZClient; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); +use MARC::Charset; use Unicode::Normalize; use XML::LibXML; @@ -16,6 +17,9 @@ use OpenILS::Application::AppUtils; use OpenSRF::Utils::Logger qw/$logger/; use OpenILS::Utils::CStoreEditor q/:funcs/; +MARC::Charset->assume_unicode(1); +MARC::Charset->ignore_errors(1); + my $output = "usmarc"; my $U = 'OpenILS::Application::AppUtils'; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/asset.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/asset.pm index 622a1dbbf1..42fb89161f 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/asset.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/asset.pm @@ -11,7 +11,7 @@ use OpenSRF::Utils::JSON; my $log = 'OpenSRF::Utils::Logger'; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); sub circ_count { my $self = shift; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm index 119e766349..a411b21e07 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm @@ -11,7 +11,7 @@ use OpenILS::Utils::Fieldmapper; use OpenILS::Utils::CStoreEditor qw/:funcs/; use MARC::Batch; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); use OpenILS::Utils::Fieldmapper; use Time::HiRes qw(time); use OpenSRF::Utils::Logger qw/$logger/; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm index 8234d1cfeb..502df6a664 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm @@ -29,7 +29,7 @@ use OpenILS::Utils::Fieldmapper; use OpenSRF::Utils::Logger qw/$logger/; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); use UNIVERSAL::require; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm index a0dfea9aa1..180c123159 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm @@ -28,7 +28,7 @@ use OpenSRF::Utils::Logger qw/$logger/; use OpenILS::Application::AppUtils; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); my $log = 'OpenSRF::Utils::Logger'; my $U = 'OpenILS::Application::AppUtils'; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm index 8f9f0ce046..18cf327292 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm @@ -29,7 +29,7 @@ use OpenILS::Utils::Fieldmapper; use OpenSRF::Utils::Logger qw/$logger/; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); use UNIVERSAL::require; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm index 314b2e3153..f5cb956629 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm @@ -25,7 +25,7 @@ use OpenILS::Utils::Fieldmapper; use OpenSRF::Utils::Logger qw/$logger/; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); use MIME::Base64; use Digest::MD5 qw/md5_hex/; diff --git a/Open-ILS/src/support-scripts/marc_export.in b/Open-ILS/src/support-scripts/marc_export.in index 08a164e918..c0ba79638e 100755 --- a/Open-ILS/src/support-scripts/marc_export.in +++ b/Open-ILS/src/support-scripts/marc_export.in @@ -14,7 +14,7 @@ use OpenILS::Utils::Fieldmapper; use OpenILS::Utils::CStoreEditor; use MARC::Record; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); use UNIVERSAL::require; use Time::HiRes qw/time/; diff --git a/Open-ILS/src/support-scripts/marc_stream_importer.pl b/Open-ILS/src/support-scripts/marc_stream_importer.pl index 5f74e3695f..69526af684 100755 --- a/Open-ILS/src/support-scripts/marc_stream_importer.pl +++ b/Open-ILS/src/support-scripts/marc_stream_importer.pl @@ -18,7 +18,7 @@ use Net::Server::PreFork; use base qw/Net::Server::PreFork/; use MARC::Record; use MARC::Batch; -use MARC::File::XML; +use MARC::File::XML ( BinaryEncoding => 'UTF-8' ); use MARC::File::USMARC; use Data::Dumper; -- 2.43.2