X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=basket%2Fsendbasket.pl;h=af47302d5c2876602561a512cb4506c744b2d56e;hb=6388fbbd7f60dd65cbcf71a16e9cafe88a3c8a87;hp=9e273b1f45be255b281b14df6db749bff238df20;hpb=f3f41caa6dd07d18db4e73216e3f58a92d826c3e;p=koha-ffzg.git

diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl
index 9e273b1f45..af47302d5c 100755
--- a/basket/sendbasket.pl
+++ b/basket/sendbasket.pl
@@ -18,15 +18,17 @@
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use Encode qw(encode);
-use Carp;
-use Try::Tiny;
-
-use C4::Biblio;
-use C4::Items;
-use C4::Auth;
-use C4::Output;
-use C4::Templates ();
+use Encode;
+use Carp qw( carp );
+use Try::Tiny qw( catch try );
+
+use C4::Biblio qw(
+    GetMarcSubjects
+);
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
+use C4::Templates;
+use Koha::Biblios;
 use Koha::Email;
 use Koha::Token;
 
@@ -67,16 +69,12 @@ if ( $email_add ) {
     foreach my $biblionumber (@bibs) {
         $template2->param( biblionumber => $biblionumber );
 
-        my $dat              = GetBiblioData($biblionumber);
-        next unless $dat;
-        my $record           = GetMarcBiblio({
-            biblionumber => $biblionumber,
-            embed_items => 1 });
-        my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
+        my $biblio           = Koha::Biblios->find( $biblionumber ) or next;
+        my $dat              = $biblio->unblessed;
+        my $record           = $biblio->metadata->record({ embed_items => 1 });
+        my $marcauthorsarray = $biblio->get_marc_contributors;
         my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
 
-        my @items = GetItemsInfo( $biblionumber );
-
         my $hasauthors = 0;
         if($dat->{'author'} || @$marcauthorsarray) {
           $hasauthors = 1;
@@ -87,7 +85,10 @@ if ( $email_add ) {
         $dat->{MARCAUTHORS}    = $marcauthorsarray;
         $dat->{HASAUTHORS}     = $hasauthors;
         $dat->{'biblionumber'} = $biblionumber;
-        $dat->{ITEM_RESULTS}   = \@items;
+        $dat->{ITEM_RESULTS}   = $biblio->items->search_ordered;
+        my ( $host, $relatedparts ) = $biblio->get_marc_host;
+        $dat->{HOSTITEMENTRIES} = $host;
+        $dat->{RELATEDPARTS} = $relatedparts;
 
         $iso2709 .= $record->as_usmarc();