From 02ef86b67b8f2eab59528496b977ec5fe35c72f1 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 29 Nov 2017 18:57:09 +0100
Subject: [PATCH] FEATURE: Provide new feature to configure fields to search in

This enables you to search only in some fields.
Also if some fields contain mapping, you can add them in addition to
e.g. `_all`.
---
 Classes/Domain/Search/QueryFactory.php         | 18 ++++++++----------
 Configuration/TypoScript/setup.txt             |  6 ++++++
 .../source/configuration/searching.rst         | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Classes/Domain/Search/QueryFactory.php b/Classes/Domain/Search/QueryFactory.php
index f73372d..980b763 100644
--- a/Classes/Domain/Search/QueryFactory.php
+++ b/Classes/Domain/Search/QueryFactory.php
@@ -99,20 +99,18 @@ class QueryFactory
             return;
         }
 
-        $query = ArrayUtility::setValueByPath(
-            $query,
-            'query.bool.must.0.match._all.query',
-            $searchRequest->getSearchTerm()
-        );
+        $matchExpression = [
+            'type' => 'most_fields',
+            'query' => $searchRequest->getSearchTerm(),
+            'fields' => GeneralUtility::trimExplode(',', $this->configuration->get('searching.fields.query')),
+        ];
 
         $minimumShouldMatch = $this->configuration->getIfExists('searching.minimumShouldMatch');
         if ($minimumShouldMatch) {
-            $query = ArrayUtility::setValueByPath(
-                $query,
-                'query.bool.must.0.match._all.minimum_should_match',
-                $minimumShouldMatch
-            );
+            $matchExpression['minimum_should_match'] = $minimumShouldMatch;
         }
+
+        $query = ArrayUtility::setValueByPath($query, 'query.bool.must.0.multi_match', $matchExpression);
     }
 
     protected function addBoosts(SearchRequestInterface $searchRequest, array &$query)
diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
index 67612e1..1a1577f 100644
--- a/Configuration/TypoScript/setup.txt
+++ b/Configuration/TypoScript/setup.txt
@@ -21,6 +21,12 @@ plugin {
                     abstractFields = {$plugin.tx_searchcore.settings.indexing.pages.abstractFields}
                 }
             }
+
+            searching {
+                fields {
+                    query = _all
+                }
+            }
         }
     }
 }
diff --git a/Documentation/source/configuration/searching.rst b/Documentation/source/configuration/searching.rst
index e953dcb..ae73fad 100644
--- a/Documentation/source/configuration/searching.rst
+++ b/Documentation/source/configuration/searching.rst
@@ -151,7 +151,18 @@ filtering. This way you can use arbitrary filter names and map them to existing
 fields
 ------
 
-Defines the fields to fetch from elasticsearch. Two sub entries exist:
+Defines the fields to fetch and search from elasticsearch. With the following sub keys:
+
+``query`` defines the fields to search in. Default is ``_all`` from 5.x times of elasticsearch.
+Configure a comma separated list of fields to search in. This is necessary if you have configured
+special mapping for some fields, or just want to search some fields.
+The most hits get ranked highest. The following is an example configuration::
+
+    fields {
+        query = _all, city
+    }
+
+The following sub properties configure the fields to fetch from elasticsearch:
 
 First ``stored_fields`` which is a list of comma separated fields which actually exist and will be
 added. Typically you will use ``_source`` to fetch the whole indexed fields.