gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 2857: fix UTF-8 conversion issues in web services 

svc/bib and svc/new_bib had two problems related to UTF-8 character conversion:

[1] Couple instances of "Wide character" warnings
[2] When saving a new (MARC21) bib whose Leader/09 was not 'a', did not apply
default character conversion and set the Leader/09 to 'a'.

Fix includes two parts:

[1] Setting :utf8 on STDOUT
[2] Doing default MARC-8 to UTF-8 conversion if applicable

This patch also turns on warnings in all scripts under svc per bug 2505.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Galen Charlton 2008-12-10 14:02:17 -06:00
parent ce8e70c6c6
commit 08454fbeee
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
svc/authentication
View File

@ -19,6 +19,8 @@
#
use strict;
use warnings;
use CGI;
use C4::Auth qw/check_api_auth/;
use XML::Simple;

3
svc/bib
View File

@ -19,12 +19,15 @@
#
use strict;
use warnings;
use CGI;
use C4::Auth qw/check_api_auth/;
use C4::Biblio;
use XML::Simple;
my $query = new CGI;
binmode STDOUT, ":utf8";
my ($status, $cookie, $sessionID) = check_api_auth($query, { editcatalogue => 1} );
unless ($status eq "ok") {

2
svc/bib_profile
View File

@ -19,6 +19,8 @@
#
use strict;
use warnings;
use CGI;
use C4::Auth qw/check_api_auth/;
use C4::Context;

13
svc/new_bib
View File

@ -19,12 +19,16 @@
#
use strict;
use warnings;
use CGI;
use C4::Auth qw/check_api_auth/;
use C4::Biblio;
use XML::Simple;
use C4::Charset;
my $query = new CGI;
binmode STDOUT, ":utf8";
my ($status, $cookie, $sessionID) = check_api_auth($query, { editcatalogue => 1} );
unless ($status eq "ok") {
@ -48,12 +52,19 @@ sub add_bib {
my $inxml = $query->param('POSTDATA');
print $query->header(-type => 'text/xml');
my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", C4::Context->preference('marcflavour'))};
my $marcflavour = C4::Context->preference('marcflavour') || 'MARC21';
my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", $marcflavour)};
my $do_not_escape = 0;
if ($@) {
$result->{'status'} = "failed";
$result->{'error'} = $@;
} else {
# fix character set
if ($record->encoding() eq 'MARC-8') {
my ($guessed_charset, $charset_errors);
($record, $guessed_charset, $charset_errors) = MarcToUTF8Record($record, $marcflavour);
}
# delete any item tags
my ( $itemtag, $itemsubfield ) = GetMarcFromKohaField("items.itemnumber", '');
foreach my $field ($record->field($itemtag)) {