Bug 15177: TO_PROCESS notice for fr-FR

[koha-ffzg.git] / acqui / neworderbiblio.pl

diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index bc782af..26d868b 100755 (executable)
--- 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,8 +59,7 @@ 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;
@@ -68,6 +67,8 @@ use C4::Koha;
 use C4::Members qw/ GetMember /;
 use C4::Budgets qw/ GetBudgetHierarchy /;
 
+use Koha::Acquisition::Bookseller;
+
 my $input = new CGI;
 
 #getting all CGI params into a hash.
@@ -79,12 +80,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,
@@ -94,8 +95,17 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 # Searching the catalog.
 
-    # find results
-my ( $error, $marcresults, $total_hits ) = SimpleSearch( $query, $results_per_page * ( $page - 1 ), $results_per_page );
+my @operands = $query;
+my $QParser;
+$QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
+my $builtquery;
+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);
+}
+my ( $error, $marcresults, $total_hits ) = SimpleSearch( $builtquery, $results_per_page * ( $page - 1 ), $results_per_page );
 
 if (defined $error) {
     $template->param(
@@ -111,7 +121,7 @@ if (defined $error) {
 my @results;
 
 foreach my $result ( @{$marcresults} ) {
-    my $marcrecord = MARC::File::USMARC::decode( $result );
+    my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result );
     my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
 
     $biblio->{booksellerid} = $booksellerid;
@@ -138,7 +148,7 @@ $template->param(
     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