From 35bbde509361ebccbf5205083b17ed650d41eeb1 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Mon, 7 Aug 2017 16:07:40 -0300
Subject: [PATCH] Bug 18624: Minor refactoring to ease testing

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit ff41b87302c1b242f9edd7b2e8c253bd18b57ac1)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 4c50a19ab920b488193d78ee18d89bb143ddae4a)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../Elasticsearch/QueryBuilder.pm             | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
index 222bb12c35..37a4a3e6a1 100644
--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
@@ -47,7 +47,7 @@ use Modern::Perl;
 use URI::Escape;
 
 use C4::Context;
-use Data::Dumper;    # TODO remove
+use Koha::Exceptions;
 
 =head2 build_query
 
@@ -408,6 +408,16 @@ appropriate search object.
 
 =cut
 
+our $koha_to_index_name = {
+    mainmainentry   => 'Heading-Main',
+    mainentry       => 'Heading',
+    match           => 'Match',
+    'match-heading' => 'Match-heading',
+    'see-from'      => 'Match-heading-see-from',
+    thesaurus       => 'Subject-heading-thesaurus',
+    any              => ''
+};
+
 sub build_authorities_query_compat {
     my ( $self, $marclist, $and_or, $excluding, $operator, $value,
         $authtypecode, $orderby )
@@ -417,24 +427,15 @@ sub build_authorities_query_compat {
     # extensible hash form that is understood by L<build_authorities_query>.
     my @searches;
 
-    my %koha_to_index_name = (
-        mainmainentry   => 'Heading-Main',
-        mainentry       => 'Heading',
-        match           => 'Match',
-        'match-heading' => 'Match-heading',
-        'see-from'      => 'Match-heading-see-from',
-        thesaurus       => 'Subject-heading-thesaurus',
-        any              => '',
-    );
-
     # Make sure everything exists
     foreach my $m (@$marclist) {
-        confess "Invalid marclist field provided: $m" unless exists $koha_to_index_name{$m};
+        Koha::Exceptions::WrongParameter->throw("Invalid marclist field provided: $m")
+            unless exists $koha_to_index_name->{$m};
     }
     for ( my $i = 0 ; $i < @$value ; $i++ ) {
         push @searches,
           {
-            where    => $koha_to_index_name{$marclist->[$i]},
+            where    => $koha_to_index_name->{$marclist->[$i]},
             operator => $operator->[$i],
             value    => $value->[$i],
           };
-- 
2.39.2