[biblibre-newacq] (bug #3616) fix neworderempty

[koha_gimpoz] / acqui / neworderbiblio.pl

diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index c314ea9..30f6150 100755 (executable)
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -4,6 +4,7 @@
 #now script to do searching for acquisitions
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2008-2009 BibLibre SARL
 #
 # This file is part of Koha.
 #
@@ -55,11 +56,11 @@ the basket number to know on which basket this script have to add a new order.
 =cut
 
 use strict;
+
 use C4::Search;
 use CGI;
 use C4::Bookseller;
 use C4::Biblio;
-
 use C4::Auth;
 use C4::Output;
 use C4::Koha;
@@ -72,10 +73,9 @@ my $params = $input->Vars;
 my $page             = $params->{'page'} || 1;
 my $query            = $params->{'q'};
 my $results_per_page = $params->{'num'} || 20;
-
-my $booksellerid = $params->{'booksellerid'};
-my $basketno     = $params->{'basketno'};
-my $sub          = $params->{'sub'};
+my $booksellerid     = $params->{'booksellerid'};
+my $basketno         = $params->{'basketno'};
+my $sub              = $params->{'sub'};
 
 # getting the template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -84,7 +84,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
+        flagsrequired   => { acquisition => 'order_manage' },
     }
 );
 
@@ -92,42 +92,41 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my ($error, $marcresults, $total_hits) = SimpleSearch($query, $results_per_page * ($page - 1), $results_per_page);
 
 if (defined $error) {
-    $template->param(query_error => $error);
     warn "error: ".$error;
+    $template->param(
+        query_error => $error,
+        basketno             => $basketno,
+        booksellerid     => $bookseller->{'id'},
+        name             => $bookseller->{'name'},
+    );
     output_html_with_http_headers $input, $cookie, $template->output;
     exit;
 }
 
 my @results;
 
-foreach my $i ( 0 .. scalar @$marcresults ) {
-    my %resultsloop;
-    my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
-    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;
+if ($marcresults) {
+    foreach my $i ( 0 .. scalar @$marcresults ) {
+        my %resultsloop;
+        my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
+        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;
+    }
 }
 
 $template->param(
     basketno             => $basketno,
-    booksellerid         => $booksellerid,
+    booksellerid     => $bookseller->{'id'},
+    name             => $bookseller->{'name'},
     resultsloop          => \@results,
     total                => $total_hits,
     query                => $query,
-    virtualshelves       => C4::Context->preference("virtualshelves"),
-    LibraryName          => C4::Context->preference("LibraryName"),
-    OpacNav              => C4::Context->preference("OpacNav"),
-    opaccredits          => C4::Context->preference("opaccredits"),
-    AmazonContent        => C4::Context->preference("AmazonContent"),
-    opacsmallimage       => C4::Context->preference("opacsmallimage"),
-    opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
-    opaccolorstylesheet  => C4::Context->preference("opaccolorstylesheet"),
-    "BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1,
-    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
+    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?q=$query&booksellerid=$booksellerid&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
 );
 
 # BUILD THE TEMPLATE