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

Merge pull request #1395 from jygaulier/PHRAS-442_FACETS-IN-API

Browse Source 
PHRAS-442
This commit is contained in:
Benoît Burnichon
2015-06-29 17:55:56 +02:00
parent f147c8bc7e 2ee19c17f5
commit 041f017fd7
5 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
View File

@@ -271,13 +271,13 @@ class ElasticSearchEngine implements SearchEngineInterface
$res = $this->client->search($params);
$results = new ArrayCollection();
$suggestions = new ArrayCollection();
$n = 0;
foreach ($res['hits']['hits'] as $hit) {
$results[] = ElasticsearchRecordHydrator::hydrate($hit, $n++);
}
/** @var FacetsResponse $facets */
$facets = $this->facetsResponseFactory->__invoke($res);
$query['ast'] = $this->app['query_compiler']->parse($string)->dump();
@@ -285,9 +285,20 @@ class ElasticSearchEngine implements SearchEngineInterface
$query['query'] = $params['body'];
$query['query_string'] = json_encode($params['body']);
return new SearchEngineResult($results, json_encode($query), $res['took'], $offset,
$res['hits']['total'], $res['hits']['total'], null, null, $suggestions, [],
$this->indexName, $facets);
return new SearchEngineResult(
$results, // ArrayCollection of results
json_encode($query),
$res['took'], // duration
$offset, // offset start
$res['hits']['total'], // available
$res['hits']['total'], // total
null, // error
null, // warning
$facets->getAsSuggestions(), // ArrayCollection of suggestions
[], // propositions
$this->indexName,
$facets
);
}
/**

19
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
View File

@@ -3,6 +3,8 @@
namespace Alchemy\Phrasea\SearchEngine\Elastic\Search;
use Alchemy\Phrasea\Exception\RuntimeException;
use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
use Doctrine\Common\Collections\ArrayCollection;
use JsonSerializable;
class FacetsResponse implements JsonSerializable
@@ -31,6 +33,23 @@ class FacetsResponse implements JsonSerializable
}
}
/**
* @return ArrayCollection
*/
public function getAsSuggestions()
{
$suggestions = new ArrayCollection();
// for es, suggestions are a flat view of facets (api backward compatibility)
foreach ($this->facets as $facet) {
foreach ($facet['values'] as $value) {
$suggestions->add(new SearchEngineSuggestion($value['query'], $value['value'], $value['count']));
}
}
return $suggestions;
}
private function buildBucketsValues($name, $buckets)
{
$values = array();

3
lib/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestion.php
View File

@@ -74,7 +74,8 @@ class SearchEngineSuggestion
public function toArray()
{
return [
'query' => $this->getSuggestion(),
'suggestion' => $this->getSuggestion(),
'query' => $this->getQuery(),
'hits' => $this->getHits(),
];
}