Bug 17380: [QA Follow-up] Report error to user instead of throwing exception

[koha.git] / svc / bib

diff --git a/svc/bib b/svc/bib
index d7cd169..2e5f38d 100755 (executable)
--- a/svc/bib
+++ b/svc/bib
@@ -5,24 +5,24 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth qw/check_api_auth/;
 use C4::Biblio;
 use C4::Items;
@@ -66,9 +66,11 @@ exit 0;
 sub fetch_bib {
     my $query = shift;
     my $biblionumber = shift;
-    my $record = GetMarcBiblio( $biblionumber, $query->url_param('items') );
+    my $record = GetMarcBiblio({
+        biblionumber => $biblionumber,
+        embed_items  => $query->url_param('items') });
     if  (defined $record) {
-        print $query->header(-type => 'text/xml');
+        print $query->header(-type => 'text/xml',-charset => 'utf-8',);
         print $record->as_xml_record();
     } else {
         print $query->header(-type => 'text/xml', -status => '404 Not Found');
@@ -78,7 +80,7 @@ sub fetch_bib {
 sub update_bib {
     my $query = shift;
     my $biblionumber = shift;
-    my $old_record = GetMarcBiblio($biblionumber);
+    my $old_record = GetMarcBiblio({ biblionumber => $biblionumber });
     unless  (defined $old_record) {
         print $query->header(-type => 'text/xml', -status => '404 Not Found');
         return;
@@ -86,7 +88,7 @@ sub update_bib {
 
     my $result = {};
     my $inxml = $query->param('POSTDATA');
-    print $query->header(-type => 'text/xml');
+    print $query->header(-type => 'text/xml', -charset => 'utf-8');
 
     my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", C4::Context->preference('marcflavour'))};
     my $do_not_escape = 0;
@@ -113,8 +115,9 @@ sub update_bib {
         }
 
         ModBiblio( $record, $biblionumber, '' );
-        my $new_record =
-          GetMarcBiblio( $biblionumber, $query->url_param('items') );
+        my $new_record = GetMarcBiblio({
+            biblionumber => $biblionumber,
+            embed_items  => $query->url_param('items') });
 
         $result->{'status'} = "ok";
         $result->{'biblionumber'} = $biblionumber;