hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +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

17
lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
View File

@@ -1099,18 +1099,19 @@ class V1Controller extends Controller
$this->getSearchEngine()->clearCache(); $this->getSearchEngine()->clearCache();
$ret = [ $ret = [
'offset_start' => $offsetStart, 'offset_start' => $offsetStart,
'per_page' => $perPage, 'per_page' => $perPage,
'available_results' => $search_result->getAvailable(), 'available_results' => $search_result->getAvailable(),
'total_results' => $search_result->getTotal(), 'total_results' => $search_result->getTotal(),
'error' => (string)$search_result->getError(), 'error' => (string)$search_result->getError(),
'warning' => (string)$search_result->getWarning(), 'warning' => (string)$search_result->getWarning(),
'query_time' => $search_result->getDuration(), 'query_time' => $search_result->getDuration(),
'search_indexes' => $search_result->getIndexes(), 'search_indexes' => $search_result->getIndexes(),
'suggestions' => array_map( 'suggestions' => array_map(
function (SearchEngineSuggestion $suggestion) { function (SearchEngineSuggestion $suggestion) {
return $suggestion->toArray(); return $suggestion->toArray();
}, $search_result->getSuggestions()->toArray()), }, $search_result->getSuggestions()->toArray()),
'facets' => $search_result->getFacets(),
'results' => [], 'results' => [],
'query' => $search_result->getQuery(), 'query' => $search_result->getQuery(),
]; ];

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

@@ -271,13 +271,13 @@ class ElasticSearchEngine implements SearchEngineInterface
$res = $this->client->search($params); $res = $this->client->search($params);
$results = new ArrayCollection(); $results = new ArrayCollection();
$suggestions = new ArrayCollection();
$n = 0; $n = 0;
foreach ($res['hits']['hits'] as $hit) { foreach ($res['hits']['hits'] as $hit) {
$results[] = ElasticsearchRecordHydrator::hydrate($hit, $n++); $results[] = ElasticsearchRecordHydrator::hydrate($hit, $n++);
} }
/** @var FacetsResponse $facets */
$facets = $this->facetsResponseFactory->__invoke($res); $facets = $this->facetsResponseFactory->__invoke($res);
$query['ast'] = $this->app['query_compiler']->parse($string)->dump(); $query['ast'] = $this->app['query_compiler']->parse($string)->dump();
@@ -285,9 +285,20 @@ class ElasticSearchEngine implements SearchEngineInterface
$query['query'] = $params['body']; $query['query'] = $params['body'];
$query['query_string'] = json_encode($params['body']); $query['query_string'] = json_encode($params['body']);
return new SearchEngineResult($results, json_encode($query), $res['took'], $offset, return new SearchEngineResult(
$res['hits']['total'], $res['hits']['total'], null, null, $suggestions, [], $results, // ArrayCollection of results
$this->indexName, $facets); 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; namespace Alchemy\Phrasea\SearchEngine\Elastic\Search;
use Alchemy\Phrasea\Exception\RuntimeException; use Alchemy\Phrasea\Exception\RuntimeException;
use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
use Doctrine\Common\Collections\ArrayCollection;
use JsonSerializable; use JsonSerializable;
class FacetsResponse implements 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) private function buildBucketsValues($name, $buckets)
{ {
$values = array(); $values = array();

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

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

4
tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineSuggestionTest.php
View File

@@ -44,7 +44,7 @@ class SearchEngineSuggestionTest extends \PhraseanetTestCase
$hits = 35; $hits = 35;
$suggestion = new SearchEngineSuggestion($query, $words, $hits); $suggestion = new SearchEngineSuggestion($query, $words, $hits);
$this->assertEquals(['query' => $words, 'hits' => 35], $suggestion->toArray()); $this->assertEquals(['query' => $query, 'hits' => 35, 'suggestion' => $words], $suggestion->toArray());
} }
public function testToArrayWithNullValue() public function testToArrayWithNullValue()
@@ -54,6 +54,6 @@ class SearchEngineSuggestionTest extends \PhraseanetTestCase
$hits = null; $hits = null;
$suggestion = new SearchEngineSuggestion($query, $words, $hits); $suggestion = new SearchEngineSuggestion($query, $words, $hits);
$this->assertEquals(['query' => $words, 'hits' => null], $suggestion->toArray()); $this->assertEquals(['query' => $query, 'hits' => null, 'suggestion' => $words], $suggestion->toArray());
} }
} }