Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-11-27 04:36:12 +01:00
Code Releases Activity

[TASK] Remove deprecated _all field query for Elastic 6.x

Browse source 
See: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-all-field.html
This commit is contained in:
Benjamin Serfhos 2018-10-03 10:59:54 +02:00
parent a93a7af27f
commit acac544f77
3 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Classes/Domain/Search/QueryFactory.php
View file

@ -25,8 +25,8 @@ use Codappix\SearchCore\Configuration\ConfigurationContainerInterface;
use Codappix\SearchCore\Configuration\ConfigurationUtility; use Codappix\SearchCore\Configuration\ConfigurationUtility;
use Codappix\SearchCore\Configuration\InvalidArgumentException; use Codappix\SearchCore\Configuration\InvalidArgumentException;
use Codappix\SearchCore\Connection\SearchRequestInterface; use Codappix\SearchCore\Connection\SearchRequestInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\ArrayUtility; use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
class QueryFactory class QueryFactory
{ {
@ -122,9 +122,13 @@ class QueryFactory
$matchExpression = [ $matchExpression = [
'type' => 'most_fields', 'type' => 'most_fields',
'query' => $searchRequest->getSearchTerm(), 'query' => $searchRequest->getSearchTerm(),
'fields' => GeneralUtility::trimExplode(',', $this->configuration->get('searching.fields.query')),
]; ];
$fieldsToQuery = GeneralUtility::trimExplode(',', $this->configuration->getIfExists('searching.fields.query'), true);
if (!empty($fieldsToQuery)) {
$matchExpression['fields'] = $fieldsToQuery;
}
$minimumShouldMatch = $this->configuration->getIfExists('searching.minimumShouldMatch'); $minimumShouldMatch = $this->configuration->getIfExists('searching.minimumShouldMatch');
if ($minimumShouldMatch) { if ($minimumShouldMatch) {
$matchExpression['minimum_should_match'] = $minimumShouldMatch; $matchExpression['minimum_should_match'] = $minimumShouldMatch;

3
Configuration/TypoScript/setup.txt
View file

@ -26,7 +26,8 @@ plugin {
searching { searching {
fields { fields {
query = _all # Default query fields (leave empty for all)
query =
} }
} }
} }

17
Resources/Private/Templates/Search/Search.html
View file

@ -1,13 +1,20 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true">
<div class="core-search">
<f:form name="searchRequest" object="{searchRequest}"> <f:form name="searchRequest" object="{searchRequest}">
<f:form.textfield property="query"/> <f:form.textfield property="query"/>
<f:form.submit value="search"/> <f:form.submit value="search"/>
</f:form> </f:form>
<ul>
<f:for each="{searchResult}" as="result"> <f:for each="{searchResult}" as="result">
<f:link.page pageUid="{result.hit._source.pid}"> <li>
{result.id} [{result.type}] - {result.hit._source.search_title} <f:link.page pageUid="{result.plainData.uid}">
[{result.type}:{result.plainData.uid}] - {result.plainData.search_title}
</f:link.page> </f:link.page>
<br> </li>
</f:for> </f:for>
</ul>
</div>
</html>