Bug 24827: Standardise on 'UTF-8' as the encoding name

This patch standardises the encoding name used in direct calls
to new_from_xml() to 'UTF-8' instead of 'utf8' or 'utf-8'.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index f745b93d3223897ab3cf7ca23ecad3b495b13b41..60bdc8980a3fe79c1060d2ddaeebfe9a9ea5b3ff 100644 (file)
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1158,7 +1158,7 @@ sub GetMarcBiblio {
 
     if ($marcxml) {
         $record = eval {
-            MARC::Record::new_from_xml( $marcxml, "utf8",
+            MARC::Record::new_from_xml( $marcxml, "UTF-8",
                 C4::Context->preference('marcflavour') );
         };
         if ($@) { warn " problem with :$biblionumber : $@ \n$marcxml"; }

diff --git a/Koha/Biblio/Metadata.pm b/Koha/Biblio/Metadata.pm
index bdc1435b5ad26ca7f86f190db4898e9b992c3717..b43a04bdb2f2c73b0eacd3400c618a3358551941 100644 (file)
--- a/Koha/Biblio/Metadata.pm
+++ b/Koha/Biblio/Metadata.pm
@@ -67,7 +67,7 @@ sub record {
     my $record;
 
     if ( $self->format eq 'marcxml' ) {
-        $record = eval { MARC::Record::new_from_xml( $self->metadata, 'utf-8', $self->schema ); };
+        $record = eval { MARC::Record::new_from_xml( $self->metadata, 'UTF-8', $self->schema ); };
         my $marcxml_error = $@;
         chomp $marcxml_error;
         unless ($record) {

diff --git a/misc/batchRebuildBiblioTables.pl b/misc/batchRebuildBiblioTables.pl
index 15f650377a588d6956d9287ecd4104486cb0e8ad..edc7c16d336343c463fac89e8f9b486fe41f38c3 100755 (executable)
--- a/misc/batchRebuildBiblioTables.pl
+++ b/misc/batchRebuildBiblioTables.pl
@@ -63,7 +63,7 @@ while (my ($biblionumber, $frameworkcode) = $sth->fetchrow) {
 
     $marcxml = C4::Charset::StripNonXmlChars( $marcxml );
     my $record = eval {
-        MARC::Record::new_from_xml($marcxml, 'utf8', $marcflavour);
+        MARC::Record::new_from_xml($marcxml, 'UTF-8', $marcflavour);
     };
     if ($@) {
         push @errors, $biblionumber;

diff --git a/misc/migration_tools/build_oai_sets.pl b/misc/migration_tools/build_oai_sets.pl
index a19cc4c025e712b53132a6d5b3a316382528cdb9..64addad2ce8d3ded265f8f1425575671892df697 100755 (executable)
--- a/misc/migration_tools/build_oai_sets.pl
+++ b/misc/migration_tools/build_oai_sets.pl
@@ -121,7 +121,7 @@ foreach my $res (@$results) {
     MARC::File::XML->default_record_format(C4::Context->preference('marcflavour'));
     my $record;
     eval {
-        $record = MARC::Record::new_from_xml($marcxml, "utf8", C4::Context->preference('marcflavour'));
+        $record = MARC::Record::new_from_xml($marcxml, "UTF-8", C4::Context->preference('marcflavour'));
     };
     if($@) {
         warn "(biblio $biblionumber) Error while creating record from marcxml: $@";

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 0e7a33a44aaa60ee8ad22b1de4c6d70928d0d269..c13faacaa343c1734f0856aa7de06f0dfabc6167 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -97,7 +97,7 @@ foreach my $issue ( @{$issues} ) {
     if ( $marcxml ) {
         $marcxml = StripNonXmlChars( $marcxml );
         my $marc_rec =
-          MARC::Record::new_from_xml( $marcxml, 'utf8',
+          MARC::Record::new_from_xml( $marcxml, 'UTF-8',
             C4::Context->preference('marcflavour') );
         $issue->{normalized_upc} = GetNormalizedUPC( $marc_rec, C4::Context->preference('marcflavour') );
     }

diff --git a/svc/bib b/svc/bib
index 50580e820ee4ffe55e2ae9fc9c190eaed96e09d0..11cc2609162c1a0eef98d671504b53ecda36271f 100755 (executable)
--- a/svc/bib
+++ b/svc/bib
@@ -90,7 +90,7 @@ sub update_bib {
     my $inxml = $query->param('POSTDATA');
     print $query->header(-type => 'text/xml', -charset => 'utf-8');
 
-    my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", C4::Context->preference('marcflavour'))};
+    my $record = eval {MARC::Record::new_from_xml( $inxml, "UTF-8", C4::Context->preference('marcflavour'))};
     my $do_not_escape = 0;
     if ($@) {
         $result->{'status'} = "failed";

diff --git a/svc/import_bib b/svc/import_bib
index 8577036ed9f4e6a2cd688d944fdbd814f5e7646e..307346389354eb8972cb17aafb86b09d8bfe2df1 100755 (executable)
--- a/svc/import_bib
+++ b/svc/import_bib
@@ -73,7 +73,7 @@ sub import_bib {
     }
 
     my $marcflavour = C4::Context->preference('marcflavour') || 'MARC21';
-    my $marc_record = eval {MARC::Record::new_from_xml( $inxml, "utf8", $marcflavour)};
+    my $marc_record = eval {MARC::Record::new_from_xml( $inxml, "UTF-8", $marcflavour)};
     if ($@) {
         $result->{'status'} = "failed";
         $result->{'error'} = $@;

diff --git a/svc/new_bib b/svc/new_bib
index d9586dd855707f4b5062c0e31a97ef2aca8b53fb..c41d298b2ce0970d2a3583926bf9ce6a579515a0 100755 (executable)
--- a/svc/new_bib
+++ b/svc/new_bib
@@ -54,7 +54,7 @@ sub add_bib {
     print $query->header(-type => 'text/xml', -charset => 'utf-8');
 
     my $marcflavour = C4::Context->preference('marcflavour') || 'MARC21';
-    my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", $marcflavour)};
+    my $record = eval {MARC::Record::new_from_xml( $inxml, "UTF-8", $marcflavour)};
     my $do_not_escape = 0;
     if ($@) {
         $result->{'status'} = "failed";