From 08454fbeeeb1b6fde28f5d65373c11ee9746c8bb Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Wed, 10 Dec 2008 14:02:17 -0600
Subject: [PATCH] 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>
---
 svc/authentication |  2 ++
 svc/bib            |  3 +++
 svc/bib_profile    |  2 ++
 svc/new_bib        | 13 ++++++++++++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/svc/authentication b/svc/authentication
index f36d1335a5..f239a15e44 100755
--- a/svc/authentication
+++ b/svc/authentication
@@ -19,6 +19,8 @@
 #
 
 use strict;
+use warnings;
+
 use CGI;
 use C4::Auth qw/check_api_auth/;
 use XML::Simple;
diff --git a/svc/bib b/svc/bib
index b6df2e50a9..14c6066232 100755
--- a/svc/bib
+++ b/svc/bib
@@ -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") {
diff --git a/svc/bib_profile b/svc/bib_profile
index 274a634323..a62e7e0965 100755
--- a/svc/bib_profile
+++ b/svc/bib_profile
@@ -19,6 +19,8 @@
 #
 
 use strict;
+use warnings;
+
 use CGI;
 use C4::Auth qw/check_api_auth/;
 use C4::Context;
diff --git a/svc/new_bib b/svc/new_bib
index ddcdb27d1d..e4b4ce9cbd 100755
--- a/svc/new_bib
+++ b/svc/new_bib
@@ -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)) {
-- 
2.20.1