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

Merge branch '3.8'

Browse Source 
Conflicts:
	bower.json
This commit is contained in:
Romain Neutron
2013-10-15 19:11:39 +02:00
parent e5989c70b0 cc75ef5ac6
commit f7dfe893b4
21 changed files with 1341 additions and 1651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/API/V1/adapter.php
View File

@@ -12,6 +12,7 @@
use Alchemy\Phrasea\Feed\Aggregate;
use Alchemy\Phrasea\Feed\FeedInterface;
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Border\File;
use Alchemy\Phrasea\Border\Attribute\Status;
@@ -896,7 +897,7 @@ class API_V1_adapter extends API_V1_Abstract
$offsetStart = (int) ($request->get('offset_start') ? : 0);
$perPage = (int) $request->get('per_page') ? : 10;
$query = (string) $request->request->get('query');
$query = (string) $request->get('query');
$this->app['phraseanet.SE']->setOptions($options);
$this->app['phraseanet.SE']->resetCache();
@@ -929,7 +930,9 @@ class API_V1_adapter extends API_V1_Abstract
'warning' => $search_result->getWarning(),
'query_time' => $search_result->getDuration(),
'search_indexes' => $search_result->getIndexes(),
'suggestions' => $search_result->getSuggestions()->toArray(),
'suggestions' => array_map(function (SearchEngineSuggestion $suggestion) {
return $suggestion->toArray();
}, $search_result->getSuggestions()->toArray()),
'results' => array(),
'query' => $search_result->getQuery(),
);