hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix number field search

Browse Source 
Search with non numeric content will not hit number field (it breaks elasticsearch and is useless anyway)

- Rename QueryHelper::buildPrivateFieldQueries() to wrapPrivateFieldQuery().
    - Signature changed too, the third parameter is dropped an QueryContext is replaced by an array of Field.
    - Query builder closure is now passed an array of Field, not of index field names.
- Remove Field::toConceptPathIndexFieldArray() because method name was beyond understanding (and also because it wasn't needed anymore)
- Various AST node types have changed due to previous API changes
This commit is contained in:
Mathieu Darse
2015-07-23 17:39:11 +02:00
parent daea7f8c77
commit a31442368b
12 changed files with 160 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/QuotedTextNode.php
View File

@@ -4,6 +4,7 @@ namespace Alchemy\Phrasea\SearchEngine\Elastic\AST;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContext;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryHelper;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\TextQueryHelper;
class QuotedTextNode extends Node
{
@@ -16,20 +17,27 @@ class QuotedTextNode extends Node
public function buildQuery(QueryContext $context)
{
$query_builder = function (array $fields) {
$query_builder = function (array $fields) use ($context) {
$index_fields = [];
foreach ($fields as $field) {
foreach ($context->localizeField($field) as $index_fields[]);
}
if (!$index_fields) {
return null;
}
return [
'multi_match' => [
'type' => 'phrase',
'fields' => $fields,
'fields' => $index_fields,
'query' => $this->text,
]
];
};
$fields = $context->getLocalizedFields();
$query = $fields ? $query_builder($fields) : null;
foreach (QueryHelper::buildPrivateFieldQueries($context, $query_builder) as $private_field_query) {
$query = $query_builder($context->getUnrestrictedFields());
$private_fields = $context->getPrivateFields();
$private_fields = TextQueryHelper::filterCompatibleFields($private_fields, $this->text);
foreach (QueryHelper::wrapPrivateFieldQueries($private_fields, $query_builder) as $private_field_query) {
$query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
}