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

Fix search when narrowed to private fields only

Browse Source
This commit is contained in:
Mathieu Darse
2015-07-16 19:06:46 +02:00
parent 7a330d2ef6
commit 78ab5b31dc
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,9 @@ class QuotedTextNode extends Node
]; ];
}; };
$query = $query_builder($context->getLocalizedFields()); $fields = $context->getLocalizedFields();
$query = $fields ? $query_builder($fields) : null;
foreach (QueryHelper::buildPrivateFieldQueries($context, $query_builder) as $private_field_query) { foreach (QueryHelper::buildPrivateFieldQueries($context, $query_builder) as $private_field_query) {
$query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query); $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
} }

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/RawNode.php
View File

@@ -41,7 +41,9 @@ class RawNode extends Node
return $query; return $query;
}; };
$query = $query_builder($context->getRawFields()); $fields = $context->getRawFields();
$query = count($fields) ? $query_builder($fields) : null;
foreach (QueryHelper::buildPrivateFieldQueries($context, $query_builder) as $private_field_query) { foreach (QueryHelper::buildPrivateFieldQueries($context, $query_builder) as $private_field_query) {
$query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query); $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
} }

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php
View File

@@ -47,7 +47,9 @@ class TextNode extends AbstractTermNode implements ContextAbleInterface
]; ];
}; };
$query = $query_builder($context->getLocalizedFields()); $fields = $context->getLocalizedFields();
$query = count($fields) ? $query_builder($fields) : null;
foreach (QueryHelper::buildPrivateFieldQueries($context, $query_builder) as $private_field_query) { foreach (QueryHelper::buildPrivateFieldQueries($context, $query_builder) as $private_field_query) {
$query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query); $query = QueryHelper::applyBooleanClause($query, 'should', $private_field_query);
} }

10
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryHelper.php
View File

@@ -86,12 +86,20 @@ class QueryHelper
* @param array $sub_query Clause query * @param array $sub_query Clause query
* @return array Resulting query * @return array Resulting query
*/ */
public static function applyBooleanClause(array $query, $type, array $clause) public static function applyBooleanClause($query, $type, array $clause)
{ {
if (!in_array($type, ['must', 'should'])) { if (!in_array($type, ['must', 'should'])) {
throw new \InvalidArgumentException(sprintf('Type must be either "must" or "should", "%s" given', $type)); throw new \InvalidArgumentException(sprintf('Type must be either "must" or "should", "%s" given', $type));
} }
if ($query === null) {
return $clause;
}
if (!is_array($query)) {
throw new \InvalidArgumentException(sprintf('Query must be either an array or null, "%s" given', gettype($query)));
}
if (!isset($query['bool'])) { if (!isset($query['bool'])) {
// Wrap in a boolean query // Wrap in a boolean query
$bool = []; $bool = [];