Browse Source

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>
20.05.x
Andreas Roussos 4 years ago
committed by Martin Renvoize
parent
commit
1d26fb3a9d
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 2
      C4/Biblio.pm
  2. 2
      Koha/Biblio/Metadata.pm
  3. 2
      misc/batchRebuildBiblioTables.pl
  4. 2
      misc/migration_tools/build_oai_sets.pl
  5. 2
      opac/opac-readingrecord.pl
  6. 2
      svc/bib
  7. 2
      svc/import_bib
  8. 2
      svc/new_bib

2
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"; }

2
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) {

2
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;

2
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: $@";

2
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') );
}

2
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";

2
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'} = $@;

2
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";

Loading…
Cancel
Save