Bug 19340: Read basket details of transfer partner

[koha.git] / acqui / neworderbiblio.pl

diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index 057f30f..2e65569 100755 (executable)
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -64,10 +64,13 @@ use C4::Biblio;
 use C4::Auth;
 use C4::Output;
 use C4::Koha;
-use C4::Members qw/ GetMember /;
 use C4::Budgets qw/ GetBudgetHierarchy /;
 
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Booksellers;
+use Koha::SearchEngine;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
+use Koha::Patrons;
 
 my $input = new CGI;
 
@@ -80,7 +83,7 @@ my $results_per_page = $params->{'num'} || 20;
 my $booksellerid     = $params->{'booksellerid'};
 my $basketno         = $params->{'basketno'};
 my $sub              = $params->{'sub'};
-my $bookseller       = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+my $bookseller       = Koha::Acquisition::Booksellers->find( $booksellerid );
 
 # getting the template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -99,20 +102,21 @@ my @operands = $query;
 my $QParser;
 $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
 my $builtquery;
+my $builder  = Koha::SearchEngine::QueryBuilder->new({index => $Koha::SearchEngine::BIBLIOS_INDEX});
+my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::BIBLIOS_INDEX});
 if ($QParser) {
     $builtquery = $query;
 } else {
-    my ( $builterror,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type);
-    ( $builterror,$builtquery,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(undef,\@operands);
+    ( undef,$builtquery,undef,undef,undef,undef,undef,undef,undef,undef) = $builder->build_query_compat(undef,\@operands);
 }
-my ( $error, $marcresults, $total_hits ) = SimpleSearch( $builtquery, $results_per_page * ( $page - 1 ), $results_per_page );
+my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page);
 
 if (defined $error) {
     $template->param(
         query_error => $error,
         basketno             => $basketno,
-        booksellerid     => $bookseller->{'id'},
-        name             => $bookseller->{'name'},
+        booksellerid     => $bookseller->id,
+        name             => $bookseller->name,
     );
     output_html_with_http_headers $input, $cookie, $template->output;
     exit;
@@ -122,15 +126,15 @@ my @results;
 
 foreach my $result ( @{$marcresults} ) {
     my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result );
-    my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
+    my $biblio = TransformMarcToKoha( $marcrecord, '' );
 
     $biblio->{booksellerid} = $booksellerid;
     push @results, $biblio;
 
 }
 
-my $borrower= GetMember('borrowernumber' => $loggedinuser);
-my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
+my $patron = Koha::Patrons->find( $loggedinuser );
+my $budgets = GetBudgetHierarchy(q{},$patron->branchcode,$patron->borrowernumber);
 my $has_budgets = 0;
 foreach my $r (@{$budgets}) {
     if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
@@ -143,12 +147,12 @@ foreach my $r (@{$budgets}) {
 $template->param(
     has_budgets          => $has_budgets,
     basketno             => $basketno,
-    booksellerid         => $bookseller->{'id'},
-    name                 => $bookseller->{'name'},
+    booksellerid         => $bookseller->id,
+    name                 => $bookseller->name,
     resultsloop          => \@results,
     total                => $total_hits,
     query                => $query,
-    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?q=$query&booksellerid=$booksellerid&basketno=$basketno&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
+    pagination_bar       => pagination_bar( "/cgi-bin/koha/acqui/neworderbiblio.pl?q=$query&booksellerid=$booksellerid&basketno=$basketno&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
 );
 
 # BUILD THE TEMPLATE