diff --git a/VERSIONS_HOTLINE/31887 b/VERSIONS_HOTLINE/31887 new file mode 100644 index 0000000000000000000000000000000000000000..0539b4f2a155c56f2b87887bb78a5544ead843a9 --- /dev/null +++ b/VERSIONS_HOTLINE/31887 @@ -0,0 +1 @@ + - ticket #31887 : L'extension de recherche vers Gallica fonctionne pas \ No newline at end of file diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php index 0e65be08ad7558c041e3a1f2a27efdd8511f7e1b..45b1adc2ad9d775737c417291f40fcf252dddd7c 100644 --- a/library/Class/AdminVar.php +++ b/library/Class/AdminVar.php @@ -715,7 +715,7 @@ class Class_AdminVar extends Storm_Model_Abstract { public function getValeur() { - return stripslashes($this->_get('valeur')); + return $this->_get('valeur'); } diff --git a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php index eed12ee577f4c523e571399a33e5544ffaa265bb..7e6e0931556b75a89fcc3d75fb316394835e8a04 100644 --- a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php +++ b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php @@ -796,7 +796,7 @@ class AdminIndexControllerAdminVarEditSearchAlsoInPostTest /** @test */ public function varShouldContainsUrl() { - $this->assertContains('http://jumelles.fr/?q=%s', - Class_AdminVar::find('SEARCH_ALSO_IN')->getValeur()); + $this->assertEquals('http://jumelles.fr/?q=%s', + json_decode(Class_AdminVar::find('SEARCH_ALSO_IN')->getValeur())->site_url[0]); } } diff --git a/tests/application/modules/opac/controllers/RechercheControllerSearchExtensionTest.php b/tests/application/modules/opac/controllers/RechercheControllerSearchExtensionTest.php index 73425ea2d2352fa88789eadfc75f2b4bf117849c..2d82cfd57e19c780984b92a996ab7309f7784154 100644 --- a/tests/application/modules/opac/controllers/RechercheControllerSearchExtensionTest.php +++ b/tests/application/modules/opac/controllers/RechercheControllerSearchExtensionTest.php @@ -111,10 +111,12 @@ class RechercheControllerSearchExtensionEnabledTest protected function _extensionSites() { return ['site_label' => ['Jumel', 'Incomplete', - 'Trouvons.org',], + 'Trouvons.org', + 'Gallica'], 'site_url' => ['http://www.jumel39.fr/rechercher?search_api_views_fulltext=%s', '', - 'http://trouvons.org/#q=%s']]; + 'http://trouvons.org/#q=%s', + 'http://gallica.bnf.fr/services/engine/search/sru?operation=searchRetrieve&version=1.2&query=(gallica all "%s")']]; } @@ -142,6 +144,13 @@ class RechercheControllerSearchExtensionEnabledTest $this->assertXPathContentContains('//a[contains(@href, "#q=sport")]', 'Trouvons.org'); } + + + /** @test */ + public function gallicaLinkShouldBeRendered() { + $this->assertXPathContentContains('//a[contains(@href, "gallica all ")]', + 'Gallica'); + } } diff --git a/tests/library/Class/AdminVarTest.php b/tests/library/Class/AdminVarTest.php index ddbceaeda930a1cdd47121610058b274a54055ba..824bfdf2cac372a7aee8d5ff531c3a149161d749 100644 --- a/tests/library/Class/AdminVarTest.php +++ b/tests/library/Class/AdminVarTest.php @@ -83,17 +83,6 @@ class AdminVarTestGet extends AdminVarTestCase { } - /** @test */ - public function getVarShouldStripSlashes() { - $this->fixture('Class_AdminVar', - ['id' => 'JS_STAT', - 'valeur' => addslashes('<script type="text/javascript">\'test\'')]); - - $this->assertEquals('<script type="text/javascript">\'test\'', - Class_AdminVar::get('JS_STAT')); - } - - /** @test */ public function unleashFacetDescriptionShouldContainsLinkToRemoteFiles() { $this->fixture('Class_AdminVar',