Bug 24909: Add unprivileged route to get a bibliographic record

[srvgit] / authorities / auth_finder.pl

diff --git a/authorities/auth_finder.pl b/authorities/auth_finder.pl
index 7c155c0..208f076 100755 (executable)
--- a/authorities/auth_finder.pl
+++ b/authorities/auth_finder.pl
@@ -18,16 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Output;
 use C4::Auth;
 use C4::Context;
-use C4::AuthoritiesMarc;
 use C4::Acquisition;
 use C4::Koha;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
 
 use Koha::Authority::Types;
 
@@ -55,24 +55,33 @@ my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authty
 
 # If search form posted
 if ( $op eq "do_search" ) {
-    my @marclist  = $query->param('marclist');
-    my @and_or    = $query->param('and_or');
-    my @excluding = $query->param('excluding');
-    my @operator  = $query->param('operator');
+    my @marclist  = $query->multi_param('marclist');
+    my @and_or    = $query->multi_param('and_or');
+    my @excluding = $query->multi_param('excluding');
+    my @operator  = $query->multi_param('operator');
     my @value     = (
         $query->param('value_mainstr') || undef,
         $query->param('value_main')    || undef,
+        $query->param('value_match')   || undef,
         $query->param('value_any')     || undef,
-        $query->param('value_match')   || undef
     );
     my $orderby        = $query->param('orderby')        || '';
     my $startfrom      = $query->param('startfrom')      || 0;
     my $resultsperpage = $query->param('resultsperpage') || 20;
 
+    my $builder = Koha::SearchEngine::QueryBuilder->new(
+        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+    my $searcher = Koha::SearchEngine::Search->new(
+        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+    my $search_query = $builder->build_authorities_query_compat(
+        \@marclist, \@and_or, \@excluding, \@operator,
+        \@value, $authtypecode, $orderby
+    );
+    $template->param( search_query => $search_query ) if C4::Context->preference('DumpSearchQueryTemplate');
+    my $offset = $startfrom * $resultsperpage;
     my ( $results, $total ) =
-      SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value,
-        $startfrom * $resultsperpage,
-        $resultsperpage, $authtypecode, $orderby );
+        $searcher->search_auth_compat( $search_query, $offset,
+        $resultsperpage );
 
     # multi page display gestion
     my $displaynext = 0;
@@ -84,7 +93,7 @@ if ( $op eq "do_search" ) {
     my @field_data = ();
 
 # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name)
-    my @marclist_ini = $query->param('marclist');
+    my @marclist_ini = $query->multi_param('marclist');
     for ( my $i = 0 ; $i <= $#marclist ; $i++ ) {
         push @field_data, { term => "marclist",  val => $marclist_ini[$i] };
         push @field_data, { term => "and_or",    val => $and_or[$i] };
@@ -93,13 +102,13 @@ if ( $op eq "do_search" ) {
     }
 
     push @field_data,
-      { term => "value_mainstr", val => $query->param('value_mainstr') || "" };
+      { term => "value_mainstr", val => scalar $query->param('value_mainstr') || "" };
     push @field_data,
-      { term => "value_main", val => $query->param('value_main') || "" };
+      { term => "value_main", val => scalar $query->param('value_main') || "" };
     push @field_data,
-      { term => "value_any", val => $query->param('value_any') || "" };
+      { term => "value_match", val => scalar $query->param('value_match') || "" };
     push @field_data,
-      { term => "value_match", val => $query->param('value_match') || "" };
+      { term => "value_any", val => scalar $query->param('value_any') || "" };
 
     my @numbers = ();
     if ( $total > $resultsperpage ) {
@@ -141,12 +150,10 @@ if ( $op eq "do_search" ) {
         from             => $from,
         to               => $to,
         numbers          => \@numbers,
-        operator_mainstr => ( @operator > 0 && $operator[0] )
-        ? $operator[0]
-        : '',
-        operator_main  => ( @operator > 1 && $operator[1] ) ? $operator[1] : '',
-        operator_any   => ( @operator > 2 && $operator[2] ) ? $operator[2] : '',
-        operator_match => ( @operator > 3 && $operator[3] ) ? $operator[3] : '',
+        operator_mainstr => ( @operator > 0 && $operator[0] ) ? $operator[0] : '',
+        operator_main    => ( @operator > 1 && $operator[1] ) ? $operator[1] : '',
+        operator_match   => ( @operator > 2 && $operator[2] ) ? $operator[2] : '',
+        operator_any     => ( @operator > 3 && $operator[3] ) ? $operator[3] : '',
     );
 }
 else {
@@ -158,10 +165,10 @@ else {
 
 $template->param(
     op            => $op,
-    value_mainstr => $query->param('value_mainstr') || '',
-    value_main    => $query->param('value_main') || '',
-    value_any     => $query->param('value_any') || '',
-    value_match   => $query->param('value_match') || '',
+    value_mainstr => scalar $query->param('value_mainstr') || '',
+    value_main    => scalar $query->param('value_main') || '',
+    value_any     => scalar $query->param('value_any') || '',
+    value_match   => scalar $query->param('value_match') || '',
     tagid         => $tagid,
     index         => $index,
     authority_types  => $authority_types,