Bug 16259: Replace CGI->param with CGI->multi_param in list context - part 2

[koha.git] / svc / new_bib

diff --git a/svc/new_bib b/svc/new_bib
index e4b4ce9..ba6742a 100755 (executable)
--- a/svc/new_bib
+++ b/svc/new_bib
@@ -4,33 +4,34 @@
 #
 # 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., 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, 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;
 use XML::Simple;
 use C4::Charset;
 
 my $query = new CGI;
-binmode STDOUT, ":utf8";
+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);
@@ -50,7 +51,7 @@ sub add_bib {
 
     my $result = {};
     my $inxml = $query->param('POSTDATA');
-    print $query->header(-type => 'text/xml');
+    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)};
@@ -65,13 +66,26 @@ sub add_bib {
             ($record, $guessed_charset, $charset_errors) = MarcToUTF8Record($record, $marcflavour);
         }
 
+        my $fullrecord = $record->clone();
+
         # delete any item tags
-        my ( $itemtag, $itemsubfield ) = GetMarcFromKohaField("items.itemnumber", '');
-        foreach my $field ($record->field($itemtag)) {
+        my ( $itemtag, $itemsubfield ) =
+          GetMarcFromKohaField( "items.itemnumber", '' );
+        foreach my $field ( $record->field($itemtag) ) {
             $record->delete_field($field);
         }
-        my ($biblionumber, $biblioitemnumber) = AddBiblio($record, '');
+        my ( $biblionumber, $biblioitemnumber ) = AddBiblio( $record, '' );
         my $new_record = GetMarcBiblio($biblionumber);
+        if ( $query->url_param('items') ) {
+            foreach my $field ( $fullrecord->field($itemtag) ) {
+                my $one_item_record = $new_record->clone();
+                $one_item_record->add_fields($field);
+                AddItemFromMarc( $one_item_record, $biblionumber );
+            }
+        }
+
+        $new_record =
+          GetMarcBiblio( $biblionumber, $query->url_param('items') );
         $result->{'status'} = "ok";
         $result->{'biblionumber'} = $biblionumber;
         my $xml = $new_record->as_xml_record();