X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fneworderbiblio.pl;h=01fb1e2e4596294beac1e5bd03638859e2b6201b;hb=b27da7e0ce25c806612743100609255ace48257c;hp=c348940984c99909f0810bb84cedd1af624f883a;hpb=0d991c6abecc87105eddcf57db56f5e118b426dc;p=srvgit

diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index c348940984..01fb1e2e45 100755
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -8,18 +8,18 @@
 #
 # 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>.
 
 =head1 NAME
 
@@ -59,12 +59,18 @@ use strict;
 #use warnings; FIXME - Bug 2505
 
 use C4::Search;
-use CGI;
-use C4::Bookseller qw/ GetBookSellerFromId /;
+use CGI qw ( -utf8 );
 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::SearchEngine;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
 
 my $input = new CGI;
 
@@ -77,12 +83,12 @@ my $results_per_page = $params->{'num'} || 20;
 my $booksellerid     = $params->{'booksellerid'};
 my $basketno         = $params->{'basketno'};
 my $sub              = $params->{'sub'};
-my $bookseller = GetBookSellerFromId($booksellerid);
+my $bookseller       = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
 
 # getting the template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/neworderbiblio.tmpl",
+        template_name   => "acqui/neworderbiblio.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -91,13 +97,19 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 # Searching the catalog.
-my @operands = $query;
-my ( @operators, @indexes, @sort_by, @limits ) = ();
-my ( $builterror, $builtquery, $simple_query, $query_cgi, $query_desc, $limit, $limit_cgi, $limit_desc, $stopwords_removed, $query_type ) =
-      buildQuery( \@operators, \@operands, \@indexes, @limits, \@sort_by, undef, undef );
 
-    # find results
-my ( $error, $marcresults, $total_hits ) = SimpleSearch( $builtquery, $results_per_page * ( $page - 1 ), $results_per_page );
+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 {
+    ( undef,$builtquery,undef,undef,undef,undef,undef,undef,undef,undef) = $builder->build_query_compat(undef,\@operands);
+}
+my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page);
 
 if (defined $error) {
     $template->param(
@@ -113,22 +125,34 @@ if (defined $error) {
 my @results;
 
 foreach my $result ( @{$marcresults} ) {
-    my $marcrecord = MARC::File::USMARC::decode( $result );
-    my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
+    my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result );
+    my $biblio = TransformMarcToKoha( $marcrecord, '' );
 
     $biblio->{booksellerid} = $booksellerid;
     push @results, $biblio;
 
 }
 
+my $borrower= GetMember('borrowernumber' => $loggedinuser);
+my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
+my $has_budgets = 0;
+foreach my $r (@{$budgets}) {
+    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+        next;
+    }
+    $has_budgets = 1;
+    last;
+}
+
 $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