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

diff --git a/Open-ILS/src/extras/import/direct_ingest.pl b/Open-ILS/src/extras/import/direct_ingest.pl
index efda183..45df729 100755 (executable)
--- 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 45f7a56..02c3f36 100755 (executable)
--- 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 ff2011a..a1d76c0 100755 (executable)
--- 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 963b6f5..ac78c04 100755 (executable)
--- 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 f367c70..67c28f8 100755 (executable)
--- 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 f37f893..917b20f 100644 (file)
--- 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 3780d93..eee578f 100644 (file)
--- 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 18884c6..a5cd5ca 100644 (file)
--- 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 622a1db..42fb891 100644 (file)
--- 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 119e766..a411b21 100644 (file)
--- 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 8234d1c..502df6a 100644 (file)
--- 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 a0dfea9..180c123 100644 (file)
--- 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 8f9f0ce..18cf327 100644 (file)
--- 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 314b2e3..f5cb956 100644 (file)
--- 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 08a164e..c0ba796 100755 (executable)
--- 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 5f74e36..69526af 100755 (executable)
--- 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;