From 8b9de1737a310d1a46375579a02067d78fd45db6 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Tue, 6 Oct 2015 11:46:50 +0200
Subject: [PATCH] dev #29558 improve search performances
test + navigation fix
---
library/Class/Notice.php | 9 +++++----
.../modules/opac/controllers/RechercheControllerTest.php | 5 ++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index 20ec34b9b14..9d8855d08ce 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -60,11 +60,12 @@ class NoticeLoader extends Storm_Model_Loader {
$page_no);
}
+
public function findAllByIds($ids, $nb_par_page, $page_no) {
- if ($nb_par_page)
- $ids = array_slice($ids,
- ($page_no-1) * $nb_par_page,
- $nb_par_page);
+ if ($nb_par_page) {
+ $offset = ($page_no ? $page_no - 1 : 0) * $nb_par_page;
+ $ids = array_slice($ids, $offset, $nb_par_page);
+ }
if (empty($ids))
return [];
diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php
index 18269f2936e..eb9628141f7 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php
@@ -1086,8 +1086,7 @@ class RechercheControllerSimpleActionWithDefaultConfigTest extends RechercheCont
/** @test */
public function pageShouldContainsLinkToAtomFormat() {
- $this->assertXPath('//a[contains(@href, "/recherche/simple/expressionRecherche/pomme/tri/alpha_auteur/format/atom")]/img[contains(@src, "rss")]',
- $this->_response->getBody());
+ $this->assertXPath('//a[contains(@href, "/recherche/simple/expressionRecherche/pomme/tri/alpha_auteur/format/atom")]/img[contains(@src, "rss")]');
}
@@ -1610,7 +1609,7 @@ class RechercheControllerRebondTest extends AbstractControllerTestCase {
-class RechercheControllerRebondWithFacettesTest extends RechercheControllerNoticeTestCase {
+class RechercheControllerRebondWithFacettesTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
$this->dispatch('/recherche/simple/expressionRecherche/france/facette/T1/tri/alpha_titre/page/2', true);
--
GitLab