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

Merge pull request #1457 from mdarse/fix-private-fields-candidates

Browse Source 
Fix values lookup on thesaurus hydrator
This commit is contained in:
Benoît Burnichon
2015-07-27 14:36:45 +02:00
parent 81cce5efa2 5bbd4bfe33
commit 27583e9e5d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/ThesaurusHydrator.php
View File

@@ -37,17 +37,19 @@ class ThesaurusHydrator implements HydratorInterface
{
// Fields with concept inference enabled
$structure = $this->structure->getThesaurusEnabledFields();
$fields = array();
$fields = [];
$index_fields = [];
foreach ($structure as $name => $field) {
$fields[$name] = $field->getThesaurusRoots();
$index_fields[$name] = $field->getIndexField();
}
// Hydrate records with concepts
foreach ($records as &$record) {
$this->hydrate($record, $fields);
$this->hydrate($record, $fields, $index_fields);
}
}
private function hydrate(array &$record, array $fields)
private function hydrate(array &$record, array $fields, array $index_fields)
{
if (!isset($record['databox_id'])) {
throw new Exception('Expected a record with the "databox_id" key set.');
@@ -59,13 +61,14 @@ class ThesaurusHydrator implements HydratorInterface
$field_names = array();
foreach ($fields as $name => $root_concepts) {
// Loop through all values to prepare bulk query
if (isset($record['caption'][$name])) {
$field_values = \igorw\get_in($record, explode('.', $index_fields[$name]));
if ($field_values !== null) {
// Concepts are databox's specific, but when no root concepts are
// given we need to make sure we only match in the right databox.
$filter = $root_concepts
? Filter::childOfConcepts($root_concepts)
: Filter::byDatabox($record['databox_id']);
foreach ($record['caption'][$name] as $value) {
foreach ($field_values as $value) {
$values[] = $value;
$terms[] = Term::parse($value);
$filters[] = $filter;