Bug 15520: Add permission to restrict circ rules editing to own library

[koha.git] / cataloguing / addbooks.pl

diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index ae4d7ac..e374cd3 100755 (executable)
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -32,11 +32,13 @@ use C4::Biblio;
 use C4::Breeding;
 use C4::Output;
 use C4::Koha;
+use C4::Languages qw(getlanguage);
 use C4::Search;
 
 use Koha::BiblioFrameworks;
 use Koha::SearchEngine::Search;
 use Koha::SearchEngine::QueryBuilder;
+use Koha::Z3950Servers;
 
 my $input = new CGI;
 
@@ -45,6 +47,7 @@ my $query   = $input->param('q');
 my @value   = $input->multi_param('value');
 my $page    = $input->param('page') || 1;
 my $results_per_page = 20;
+my $lang = C4::Languages::getlanguage($input);
 
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -74,7 +77,8 @@ if ($query) {
     if ($QParser) {
         $builtquery = $query;
     } else {
-        ( undef,$builtquery,undef,undef,undef,undef,undef,undef,undef,undef) = $builder->build_query_compat(undef,\@operands);
+        ( undef, $builtquery, undef, undef, undef, undef, undef, undef, undef, undef ) =
+          $builder->build_query_compat( undef, \@operands, undef, undef, undef, 0, $lang );
     }
     # find results
     my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page);
@@ -133,15 +137,11 @@ for my $resultsbr (@resultsbr) {
     };
 }
 
-my $schema = Koha::Database->new()->schema();
-my $servers = $schema->resultset('Z3950server')->search(
-        {
-            recordtype => 'biblio',
-            servertype => ['zed', 'sru'],
-        },
-        {   result_class => 'DBIx::Class::ResultClass::HashRefInflator',
-            order_by     => ['rank', 'servername'],
-        },
+my $servers = Koha::Z3950Servers->search(
+    {
+        recordtype => 'biblio',
+        servertype => ['zed','sru'],
+    }
 );
 
 my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });