Merge remote-tracking branch 'origin/new/bug_6720'

[koha.git] / svc / new_bib

diff --git a/svc/new_bib b/svc/new_bib
index ddcdb27..dba1fc7 100755 (executable)
--- a/svc/new_bib
+++ b/svc/new_bib
@@ -13,20 +13,24 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 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, ':encoding(UTF-8)';
 
-my ($status, $cookie, $sessionID) = check_api_auth($query, { editcatalogue => 1} );
+my ($status, $cookie, $sessionID) = check_api_auth($query, { editcatalogue => 'edit_catalogue'} );
 unless ($status eq "ok") {
     print $query->header(-type => 'text/xml', -status => '403 Forbidden');
     print XMLout({ auth_status => $status }, NoAttr => 1, RootName => 'response', XMLDecl => 1);
@@ -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)) {