X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fneworderbiblio.pl;h=2333f89d071fba546e0c41184af41a1768286832;hb=9abcfa44e6aa8a416b28a971bb79593328e121d2;hp=471af4a3b187bcdb41d5dff003fec98b6e8f668d;hpb=4747ea7462c04770484386538b1594c1760bc75b;p=koha.git

diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index 471af4a3b1..2333f89d07 100755
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -17,9 +17,9 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 =head1 NAME
 
@@ -56,6 +56,7 @@ the basket number to know on which basket this script have to add a new order.
 =cut
 
 use strict;
+#use warnings; FIXME - Bug 2505
 
 use C4::Search;
 use CGI;
@@ -90,10 +91,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 # Searching the catalog.
-my ($error, $marcresults, $total_hits) = SimpleSearch($query, $results_per_page * ($page - 1), $results_per_page);
+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 );
 
 if (defined $error) {
-    warn "error: ".$error;
     $template->param(
         query_error => $error,
         basketno             => $basketno,
@@ -107,19 +113,15 @@ if (defined $error) {
 my @results;
 
 if ($marcresults) {
-    foreach my $i ( 0 .. scalar @$marcresults ) {
-        my %resultsloop;
-        my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
+    foreach my $result ( @{$marcresults} ) {
+        my $marcrecord = MARC::File::USMARC::decode( $result );
         my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
 
-        #build the hash for the template.
-        %resultsloop = %$biblio;
-        $resultsloop{highlight} = ( $i % 2 ) ? (1) : (0);
-        $resultsloop{booksellerid} = $booksellerid;
-        push @results, \%resultsloop;
+        $biblio->{booksellerid} = $booksellerid;
+        push @results, $biblio;
+
     }
 }
-
 $template->param(
     basketno             => $basketno,
     booksellerid     => $bookseller->{'id'},
@@ -127,7 +129,7 @@ $template->param(
     resultsloop          => \@results,
     total                => $total_hits,
     query                => $query,
-    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?q=$query&booksellerid=$booksellerid&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
+    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?q=$query&booksellerid=$booksellerid&basketno=$basketno&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
 );
 
 # BUILD THE TEMPLATE