[open-ils-commits] r20252 - in branches/rel_2_0/Open-ILS/src: extras extras/import perlmods/OpenILS/Application perlmods/OpenILS/Application/Acq perlmods/OpenILS/Application/Search perlmods/OpenILS/Application/Storage/Publisher perlmods/OpenILS/WWW support-scripts (miker)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Apr 20 12:12:01 EDT 2011
Author: miker
Date: 2011-04-20 12:11:58 -0400 (Wed, 20 Apr 2011)
New Revision: 20252
Modified:
branches/rel_2_0/Open-ILS/src/extras/import/direct_ingest.pl
branches/rel_2_0/Open-ILS/src/extras/import/direct_loader.pl
branches/rel_2_0/Open-ILS/src/extras/import/marcFilterDump.pl
branches/rel_2_0/Open-ILS/src/extras/import/marc_add_ids
branches/rel_2_0/Open-ILS/src/extras/marc2html
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Exporter.pm
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm
branches/rel_2_0/Open-ILS/src/support-scripts/marc_stream_importer.pl
Log:
Backport of trunk r20250: Always use BinaryEncodeing => "UTF-8" with MARC::File::XML
Modified: branches/rel_2_0/Open-ILS/src/extras/import/direct_ingest.pl
===================================================================
--- branches/rel_2_0/Open-ILS/src/extras/import/direct_ingest.pl 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/extras/import/direct_ingest.pl 2011-04-20 16:11:58 UTC (rev 20252)
@@ -21,7 +21,7 @@
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);
Modified: branches/rel_2_0/Open-ILS/src/extras/import/direct_loader.pl
===================================================================
--- branches/rel_2_0/Open-ILS/src/extras/import/direct_loader.pl 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/extras/import/direct_loader.pl 2011-04-20 16:11:58 UTC (rev 20252)
@@ -21,7 +21,7 @@
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);
Modified: branches/rel_2_0/Open-ILS/src/extras/import/marcFilterDump.pl
===================================================================
--- branches/rel_2_0/Open-ILS/src/extras/import/marcFilterDump.pl 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/extras/import/marcFilterDump.pl 2011-04-20 16:11:58 UTC (rev 20252)
@@ -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';
Modified: branches/rel_2_0/Open-ILS/src/extras/import/marc_add_ids
===================================================================
--- branches/rel_2_0/Open-ILS/src/extras/import/marc_add_ids 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/extras/import/marc_add_ids 2011-04-20 16:11:58 UTC (rev 20252)
@@ -6,7 +6,7 @@
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);
Modified: branches/rel_2_0/Open-ILS/src/extras/marc2html
===================================================================
--- branches/rel_2_0/Open-ILS/src/extras/marc2html 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/extras/marc2html 2011-04-20 16:11:58 UTC (rev 20252)
@@ -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;
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Order.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -188,7 +188,7 @@
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';
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -13,7 +13,7 @@
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;
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -4,7 +4,8 @@
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;
use Data::Dumper;
@@ -17,6 +18,9 @@
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';
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -11,7 +11,7 @@
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;
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -11,7 +11,7 @@
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/;
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Exporter.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Exporter.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Exporter.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -29,7 +29,7 @@
use OpenSRF::Utils::Logger qw/$logger/;
use MARC::Record;
-use MARC::File::XML;
+use MARC::File::XML ( BinaryEncoding => 'UTF-8' );
use UNIVERSAL::require;
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -28,7 +28,7 @@
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';
Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm 2011-04-20 16:11:58 UTC (rev 20252)
@@ -25,7 +25,7 @@
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/;
Modified: branches/rel_2_0/Open-ILS/src/support-scripts/marc_stream_importer.pl
===================================================================
--- branches/rel_2_0/Open-ILS/src/support-scripts/marc_stream_importer.pl 2011-04-20 16:08:34 UTC (rev 20251)
+++ branches/rel_2_0/Open-ILS/src/support-scripts/marc_stream_importer.pl 2011-04-20 16:11:58 UTC (rev 20252)
@@ -18,7 +18,7 @@
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;
More information about the open-ils-commits
mailing list