diff -r 52169c718513 -r 5b47eab083f3 server/src/app/Http/Controllers/Api/DiscourseController.php --- a/server/src/app/Http/Controllers/Api/DiscourseController.php Thu Oct 20 17:27:36 2016 +0200 +++ b/server/src/app/Http/Controllers/Api/DiscourseController.php Thu Oct 20 19:14:37 2016 +0200 @@ -3,6 +3,7 @@ namespace CorpusParole\Http\Controllers\Api; use CorpusParole\Http\Controllers\Controller; +use CorpusParole\Libraries\Filters\CorpusFilterManager; use Illuminate\Http\Request; @@ -19,7 +20,14 @@ public function index(Request $request) { - $query = [ "match_all" => []]; + $filterManager = new CorpusFilterManager(); + $filters = $filterManager->prepareFilters($request); + unset($filters['discourses']); + $qFilterParts = $filterManager->buildESFilters($filters); + + $query = $filterManager->buildQuery($qFilterParts); + + $esQuery = [ 'index' => env('ELASTICSEARCH_INDEX'),