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

Lower-level API to build concept queries

Browse Source 
Removes wrapPrivateFieldConceptQueries().
The goal is to wrap text and concept queries with a single call to wrapPrivateFieldQueries().
This commit is contained in:
Mathieu Darse
2015-08-26 19:10:27 +02:00
parent 9d6a428208
commit d6a44c8a52
3 changed files with 64 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,10 @@ class QueryHelper
foreach ($fields_map as $hash => $fields) {
// Right to query on a private field is dependant of document collection
// Here we make sure we can only match on allowed collections
$queries[] = self::restrictQueryToCollections(
$query_builder($fields),
$collections_map[$hash]
);
$query = $query_builder($fields);
if ($query !== null) {
$queries[] = self::restrictQueryToCollections($query, $collections_map[$hash]);
}
}
return $queries;
@@ -61,38 +61,6 @@ class QueryHelper
return implode('|', $collections);
}
/**
* @todo Factor with wrapPrivateFieldQueries()
*/
public static function wrapPrivateFieldConceptQueries(array $fields, \Closure $query_builder)
{
// We make a boolean clause for each collection set to shrink query size
// (instead of a clause for each field, with his collection set)
$fields_map = [];
$collections_map = [];
foreach ($fields as $field) {
$collections = $field->getDependantCollections();
$hash = self::hashCollections($collections);
$collections_map[$hash] = $collections;
if (!isset($fields_map[$hash])) {
$fields_map[$hash] = [];
}
// Merge fields with others having the same collections
$fields_map[$hash][] = $field;
}
$queries = [];
foreach ($fields_map as $hash => $fields) {
// Right to query on a private field is dependant of document collection
// Here we make sure we can only match on allowed collections
$query = $query_builder($fields);
$query = self::restrictQueryToCollections($query, $collections_map[$hash]);
$queries[] = $query;
}
return $queries;
}
/**
* Apply conjunction or disjunction between a query and a sub query clause
*