Bug 29234: Further clean Z3950 Tests

[srvgit] / svc / new_bib

diff --git a/svc/new_bib b/svc/new_bib
index ba6742a..3ce32f6 100755 (executable)
--- a/svc/new_bib
+++ b/svc/new_bib
@@ -18,8 +18,7 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Auth qw/check_api_auth/;
@@ -28,7 +27,9 @@ use C4::Items;
 use XML::Simple;
 use C4::Charset;
 
-my $query = new CGI;
+use Koha::Biblios;
+
+my $query = CGI->new;
 binmode STDOUT, ':encoding(UTF-8)';
 
 my ($status, $cookie, $sessionID) = check_api_auth($query, { editcatalogue => 'edit_catalogue'} );
@@ -51,10 +52,11 @@ sub add_bib {
 
     my $result = {};
     my $inxml = $query->param('POSTDATA');
+    my $frameworkcode = $query->url_param('frameworkcode') // '';
     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)};
+    my $record = eval {MARC::Record::new_from_xml( $inxml, "UTF-8", $marcflavour)};
     my $do_not_escape = 0;
     if ($@) {
         $result->{'status'} = "failed";
@@ -63,29 +65,30 @@ sub add_bib {
         # fix character set
         if ($record->encoding() eq 'MARC-8') {
             my ($guessed_charset, $charset_errors);
-            ($record, $guessed_charset, $charset_errors) = MarcToUTF8Record($record, $marcflavour);
+            ($record, $guessed_charset, $charset_errors) = C4::Charset::MarcToUTF8Record($record, $marcflavour);
         }
 
         my $fullrecord = $record->clone();
 
         # delete any item tags
         my ( $itemtag, $itemsubfield ) =
-          GetMarcFromKohaField( "items.itemnumber", '' );
+          C4::Biblio::GetMarcFromKohaField( "items.itemnumber" );
         foreach my $field ( $record->field($itemtag) ) {
             $record->delete_field($field);
         }
-        my ( $biblionumber, $biblioitemnumber ) = AddBiblio( $record, '' );
-        my $new_record = GetMarcBiblio($biblionumber);
+        my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio( $record, $frameworkcode );
+        my $biblio = Koha::Biblios->find( $biblionumber );
+        my $new_record = $biblio->metadata->record;
         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 );
+                C4::Items::AddItemFromMarc( $one_item_record, $biblionumber );
             }
         }
 
-        $new_record =
-          GetMarcBiblio( $biblionumber, $query->url_param('items') );
+        $biblio = Koha::Biblios->find( $biblionumber );
+        $new_record = $biblio->metadata->record({ embed_items => scalar $query->url_param('items') });
         $result->{'status'} = "ok";
         $result->{'biblionumber'} = $biblionumber;
         my $xml = $new_record->as_xml_record();