From ed5c70d349f2e3121a6983c27dc7f2975c6dafc2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 22 May 2017 15:37:49 +0200 Subject: [PATCH] Fix pagination --- app/Resources/views/model/index.html.twig | 4 ++-- .../views/pagination/sortable_link.html.twig | 12 ++++++++++++ app/Resources/views/set/index.html.twig | 10 ++++++---- app/config/config.yml | 6 +++--- app/config/config/fos_elastica.yml | 18 +++++++++++------- src/AppBundle/Controller/ModelController.php | 11 +++-------- .../Repository/Search/ModelRepository.php | 6 +++--- .../Repository/Search/SetRepository.php | 6 +++--- 8 files changed, 43 insertions(+), 30 deletions(-) create mode 100644 app/Resources/views/pagination/sortable_link.html.twig diff --git a/app/Resources/views/model/index.html.twig b/app/Resources/views/model/index.html.twig index 07cc44f..a32f7f2 100644 --- a/app/Resources/views/model/index.html.twig +++ b/app/Resources/views/model/index.html.twig @@ -25,8 +25,8 @@
Sort By
- {{ knp_pagination_sortable(models, 'Number', 'm.id', {'class':'item'}) }} - {{ knp_pagination_sortable(models, 'Name', ['m.name'], {'class':'item'}) }} + {{ knp_pagination_sortable(models, 'Number', 'm.id') }} + {{ knp_pagination_sortable(models, 'Name', 'm.name') }}
Showing
diff --git a/app/Resources/views/pagination/sortable_link.html.twig b/app/Resources/views/pagination/sortable_link.html.twig new file mode 100644 index 0000000..ba3deed --- /dev/null +++ b/app/Resources/views/pagination/sortable_link.html.twig @@ -0,0 +1,12 @@ +{% if options['class'] == 'asc' %} + {% set icon = '' %} + {% set class = 'item active' %} +{% elseif options['class'] == 'desc' %} + {% set icon = '' %} + {% set class = 'item active' %} +{% else %} + {% set icon = null %} + {% set class = 'item' %} +{% endif %} + +{{ icon|raw }} {{ title }} diff --git a/app/Resources/views/set/index.html.twig b/app/Resources/views/set/index.html.twig index 6515d4f..423376c 100644 --- a/app/Resources/views/set/index.html.twig +++ b/app/Resources/views/set/index.html.twig @@ -29,10 +29,12 @@
Sort By
- {{ knp_pagination_sortable(sets, 'Number', 's.id', {'class':'item'}) }} - {{ knp_pagination_sortable(sets, 'Year', 's.year', {'class':'item'}) }} - {{ knp_pagination_sortable(sets, 'Name', ['s.name'], {'class':'item'}) }} - {{ knp_pagination_sortable(sets, 'Parts', ['s.partCount'], {'class':'item'}) }} + + {{ knp_pagination_sortable(sets, 'Number', ['s.id']) }} + {{ knp_pagination_sortable(sets, 'Year', ['s.year']) }} + {{ knp_pagination_sortable(sets, 'Name', ['s.name']) }} + {{ knp_pagination_sortable(sets, 'Parts', ['s.partCount']) }} +
Showing
diff --git a/app/config/config.yml b/app/config/config.yml index bd01a7a..8e24293 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -99,15 +99,15 @@ knp_menu: default_renderer: twig knp_paginator: - page_range: 10 # default page range used in pagination control + page_range: 5 # default page range used in pagination control default_options: page_name: page # page query parameter name sort_field_name: sort # sort field query parameter name - sort_direction_name: direction # sort direction query parameter name + sort_direction_name: dir # sort direction query parameter name distinct: true # ensure distinct results, useful when ORM queries are using GROUP BY statements template: pagination: :pagination:knp_pagination.html.twig - sortable: KnpPaginatorBundle:Pagination:sortable_link.html.twig # sort link template + sortable: :pagination:sortable_link.html.twig oneup_flysystem: adapters: diff --git a/app/config/config/fos_elastica.yml b/app/config/config/fos_elastica.yml index 4abcb18..0dbac78 100644 --- a/app/config/config/fos_elastica.yml +++ b/app/config/config/fos_elastica.yml @@ -10,27 +10,31 @@ fos_elastica: custom_analyzer: type: custom tokenizer: nGram - filter: [lowercase, snowball] + filter: [lowercase,stopwords] tokenizer: nGram: type: nGram min_gram: 3 - max_gram: 10 + max_gram: 20 filter: snowball: type: snowball language: English + stopwords: + type: stop + stopwords: [_english_] + ignore_case : true types: set: mappings: - id: { analyzer: custom_analyzer, search_analyzer: "standard" } + id: ~ name: { analyzer: custom_analyzer, search_analyzer: "standard" } year: { type: integer } partCount: { type: integer } theme: type: "object" properties: - id: { analyzer: custom_analyzer, search_analyzer: "standard" } + id: ~ name: { analyzer: custom_analyzer, search_analyzer: "standard" } persistence: driver: orm @@ -40,16 +44,16 @@ fos_elastica: repository: AppBundle\Repository\Search\SetRepository model: mappings: - id: { analyzer: custom_analyzer, search_analyzer: "standard" } + id: ~ name: { analyzer: custom_analyzer, search_analyzer: "standard" } aliases: type: "object" properties: - id: { analyzer: custom_analyzer, search_analyzer: "standard" } + id: ~ category: type: "object" properties: - id: { analyzer: custom_analyzer, search_analyzer: "standard" } + id: ~ name: { analyzer: custom_analyzer, search_analyzer: "standard" } keywords: type: "object" diff --git a/src/AppBundle/Controller/ModelController.php b/src/AppBundle/Controller/ModelController.php index e63ce00..bc487b5 100644 --- a/src/AppBundle/Controller/ModelController.php +++ b/src/AppBundle/Controller/ModelController.php @@ -5,6 +5,7 @@ namespace AppBundle\Controller; use AppBundle\Entity\LDraw\Model; use AppBundle\Form\Search\ModelSearchType; use AppBundle\Model\ModelSearch; +use Knp\Component\Pager\Paginator; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; @@ -32,15 +33,9 @@ class ModelController extends Controller $form->handleRequest($request); $elasticaManager = $this->get('fos_elastica.manager'); - $results = $elasticaManager->getRepository(Model::class)->search($modelSearch); - - $paginator = $this->get('knp_paginator'); - $sets = $paginator->paginate( - $results, - $request->query->getInt('page', 1)/*page number*/, - $request->query->getInt('limit', 30)/*limit per page*/ - ); + $results = $elasticaManager->getRepository(Model::class)->search($modelSearch,5000); + /** @var Paginator $paginator */ $paginator = $this->get('knp_paginator'); $models = $paginator->paginate( $results, diff --git a/src/AppBundle/Repository/Search/ModelRepository.php b/src/AppBundle/Repository/Search/ModelRepository.php index dc91b8d..5f142c6 100644 --- a/src/AppBundle/Repository/Search/ModelRepository.php +++ b/src/AppBundle/Repository/Search/ModelRepository.php @@ -37,13 +37,13 @@ class ModelRepository extends Repository return new Query($boolQuery); } - public function search(ModelSearch $modelSearch) + public function search(ModelSearch $modelSearch, $limit = 500) { $query = $this->getSearchQuery($modelSearch); - return $this->find($query, 500); + return $this->find($query, $limit); } - public function findHighlighted($query, $limit = null) { + public function findHighlighted($query, $limit = 500) { $modelSearch = new ModelSearch(); $modelSearch->setQuery($query); diff --git a/src/AppBundle/Repository/Search/SetRepository.php b/src/AppBundle/Repository/Search/SetRepository.php index 21146af..cf126c8 100644 --- a/src/AppBundle/Repository/Search/SetRepository.php +++ b/src/AppBundle/Repository/Search/SetRepository.php @@ -27,9 +27,9 @@ class SetRepository extends Repository $query->setQuery($searchQuery); $query->setFuzziness(0.7); $query->setMinimumShouldMatch('80%'); - + $query->setOperator('and'); + $boolQuery->addMust($query); - } else { $query = new \Elastica\Query\MatchAll(); $boolQuery->addMust($query); @@ -69,7 +69,7 @@ class SetRepository extends Repository return $this->find($query, $limit); } - public function findHighlighted($query, $limit = null) { + public function findHighlighted($query, $limit = 500) { $setSearch = new SetSearch(); $setSearch->setQuery($query);