marc21 filed 008 - ffzg plugins modifications

[koha.git] / cataloguing / addbooks.pl

diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index 45f7d2c..2082913 100755 (executable)
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -24,26 +24,30 @@
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
+
 use CGI qw ( -utf8 );
 use C4::Auth;
 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;
 
 my $success = $input->param('biblioitem');
 my $query   = $input->param('q');
-my @value   = $input->param('value');
+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(
@@ -57,17 +61,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-# get framework list
-my $frameworks = getframeworks;
-my @frameworkcodeloop;
-foreach my $thisframeworkcode ( sort { uc($frameworks->{$a}->{'frameworktext'}) cmp uc($frameworks->{$b}->{'frameworktext'}) } keys %{$frameworks} ) {
-    push @frameworkcodeloop, {
-        value         => $thisframeworkcode,
-        frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-    };
-}
-
-
 # Searching the catalog.
 if ($query) {
 
@@ -77,12 +70,15 @@ if ($query) {
     my $QParser;
     $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
     my $builtquery;
-    my $builder  = Koha::SearchEngine::QueryBuilder->new();
-    my $searcher = Koha::SearchEngine::Search->new({index => 'biblios'});
+    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);
+        ( 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);
@@ -97,7 +93,10 @@ if ($query) {
     # format output
     # SimpleSearch() give the results per page we want, so 0 offet here
     my $total = @{$marcresults};
-    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, $marcresults );
+    my @newresults = searchResults( {'interface' => 'intranet'}, $query, $total, $results_per_page, 0, 0, $marcresults );
+    foreach my $line (@newresults) {
+        if ( not exists $line->{'size'} ) { $line->{'size'} = "" }
+    }
     $template->param(
         total          => $total_hits,
         query          => $query,
@@ -141,8 +140,17 @@ for my $resultsbr (@resultsbr) {
     };
 }
 
+my $servers = Koha::Z3950Servers->search(
+    {
+        recordtype => 'biblio',
+        servertype => ['zed','sru'],
+    }
+);
+
+my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
 $template->param(
-    frameworkcodeloop => \@frameworkcodeloop,
+    servers           => $servers,
+    frameworks        => $frameworks,
     breeding_count    => $countbr,
     breeding_loop     => $breeding_loop,
     z3950_search_params => C4::Search::z3950_search_args($query),