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

Use thesaurus bulk API for indexing

Browse Source
This commit is contained in:
Mathieu Darse
2015-03-09 18:34:37 +01:00
parent 89c23ec4ae
commit 400ecad8e6
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,27 +52,30 @@ class ThesaurusHydrator implements HydratorInterface
if (!isset($record['databox_id'])) { if (!isset($record['databox_id'])) {
throw new Exception('Expected a record with the "databox_id" key set.'); throw new Exception('Expected a record with the "databox_id" key set.');
} }
$filter = Filter::byDatabox($record['databox_id']);
$terms = array();
$fieldMap = array();
foreach ($fields as $field => $prefix) { foreach ($fields as $field => $prefix) {
if (!isset($record['caption'][$field])) { if (isset($record['caption'][$field])) {
continue; foreach ($record['caption'][$field] as $value) {
} $terms[] = Term::parse($value);
$fieldMap[] = $field;
// TODO Build prefix filter
$concepts = array();
foreach ($record['caption'][$field] as $value) {
$term = Term::parse($value);
$item_concepts = $this->thesaurus->findConcepts($term, null, $filter, true);
if ($item_concepts) {
foreach ($item_concepts as $concepts[]);
} else {
$this->candidateTerms->insert($field, $value);
} }
} }
if ($concepts) { }
$record['concept_path'][$field] = Concept::toPathArray($concepts);
// TODO Build prefix filter
$filter = Filter::byDatabox($record['databox_id']);
$bulk = $this->thesaurus->findConceptsBulk($terms, null, $filter, true);
foreach ($bulk as $offset => $item_concepts) {
if ($item_concepts) {
$field = $fieldMap[$offset];
foreach ($item_concepts as $concept) {
$record['concept_path'][$field][] = $concept->getPath();
}
} else {
$this->candidateTerms->insert($field, $value);
} }
} }
} }

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/Thesaurus.php
View File

@@ -31,12 +31,12 @@ class Thesaurus
$this->index = $index; $this->index = $index;
} }
public function findConceptsBulk(array $terms, $lang = null) public function findConceptsBulk(array $terms, $lang = null, Filter $filter, $strict = false)
{ {
// TODO Use bulk queries for performance // TODO Use bulk queries for performance
$concepts = array(); $concepts = array();
foreach ($terms as $term) { foreach ($terms as $term) {
$concepts[] = $this->findConcepts($term, $lang); $concepts[] = $this->findConcepts($term, $lang, $filter, $strict);
} }
return $concepts; return $concepts;