Skip to content
Snippets Groups Projects
Commit 5d6311c7 authored by Laurent's avatar Laurent
Browse files

Merge branch 'hotline#12905_catalogue_dynamique' into 'hotline_6.40' 

Hotline#12905 Catalogue Dynamique
parents 09dc08e2 6cef4a5a
Branches
Tags
4 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!63Rf13038,!56Rf13038 Front,!47Hotline 6.40
Hide whitespace changes
Inline Side-by-side
application/modules/admin/controllers/AjaxController.php
+ 37
− 49
View file @ 5d6311c7
......@@ -18,57 +18,30 @@
* along with AFI-OPAC 2.0; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
//////////////////////////////////////////////////////////////////////////////////////////
// OPAC3 - Appels Ajax
//
//////////////////////////////////////////////////////////////////////////////////////////
class Admin_AjaxController extends Zend_Controller_Action
{
//------------------------------------------------------------------------------------------------------
// Initialisation des parametres et du layout
//------------------------------------------------------------------------------------------------------
function init()
{
// Désactiver le view renderer
$viewRenderer = $this->getHelper('ViewRenderer');
$viewRenderer->setNoRender();
class Admin_AjaxController extends Zend_Controller_Action {
public function preDispatch() {
$this->getHelper('ViewRenderer')->setNoRender();
}
//------------------------------------------------------------------------------------------------------
// Initialisation des parametres et du layout
//------------------------------------------------------------------------------------------------------
function listesuggestionAction() {
// Parametres
$autorite=$this->_getParam('type_autorite');
$id_champ=$this->_getParam('id_champ');
$mode_recherche=$this->_getParam('mode');
$recherche=$this->_getParam('valeur');
$limite_resultat=100;
// Lancer la recherche en fonction du type d'autorite
$theme='';
switch($autorite)
{
case "auteur" : $cls=new Class_Auteur(); break;
case "matiere" : $cls=new Class_Matiere(); break;
case "interet" : $cls=new Class_CentreInteret(); break;
case "dewey" : $cls=new Class_Dewey(); break;
case "pcdm4" : $cls=new Class_Pcdm4(); break;
case "thesaurus" : $cls=new Class_CodifThesaurus();
$theme=$id_champ; break;
case "tag" : $cls=new Class_TagNotice(); break;
default: print("mauvais code rubrique"); exit;
}
if ($theme) {
$liste=$cls->getListeSuggestion($recherche,$mode_recherche,$limite_resultat,$theme);
public function listesuggestionAction() {
$autorite = $this->_getParam('type_autorite');
$id_champ = $this->_getParam('id_champ');
$mode_recherche = $this->_getParam('mode');
$recherche = $this->_getParam('valeur');
$limite_resultat = 100;
if (!$authority = $this->getAuthorityFor($autorite)) {
print('mauvais code rubrique');
return;
}
else
$liste=$cls->getListeSuggestion($recherche,$mode_recherche,$limite_resultat);
// Renvoi de la liste
if(!$liste) {
echo '';
$params = [$recherche, $mode_recherche, $limite_resultat];
if ('thesaurus' == $autorite)
$params[] = $id_champ;
if (!$liste = call_user_func_array([$authority, 'getListeSuggestion'], $params)) {
echo '';
return;
}
......@@ -76,5 +49,20 @@ class Admin_AjaxController extends Zend_Controller_Action
echo '<div class="tag_liste" clef="'.$item[0].'" onclick="selectSuggest(\''.$id_champ.'\',this)">'.$item[1].'</div>';
}
}
}
\ No newline at end of file
protected function getAuthorityFor($code) {
$authorities = ['auteur' => new Class_Auteur(),
'matiere' => new Class_Matiere(),
'interet' => new Class_CentreInteret(),
'dewey' => new Class_Dewey(),
'pcdm4' => new Class_Pcdm4(),
'thesaurus' => new Class_CodifThesaurus(),
'tag' => new Class_TagNotice()];
if (isset($authorities[$code]))
return $authorities[$code];
}
}
?>
\ No newline at end of file
library/Class/CodifThesaurus.php
+ 29
− 13
View file @ 5d6311c7
......@@ -27,6 +27,8 @@ class Class_CodifThesaurusLoader extends Storm_Model_Loader {
public function getLibelleHierarchique($enreg) {
if (!$enreg)
return '';
$parent = Class_CodifThesaurus::findParent($enreg->getIdThesaurus());
if (!$parent)
return $enreg->getLibelle();
......@@ -149,6 +151,10 @@ class Class_CodifThesaurusLoader extends Storm_Model_Loader {
class Class_CodifThesaurus extends Storm_Model_Abstract {
const CODE_FACETTE = 'H';
const MODE_HIERARCHY_CONTAINS = 1;
const MODE_LABEL_STARTS_WITH = 2;
const MODE_LABEL_CONTAINS = 3;
const MODE_INDEX_STARTS_WITH = 4;
protected $_loader_class = 'Class_CodifThesaurusLoader';
protected $_table_name = 'codif_thesaurus';
......@@ -156,29 +162,39 @@ class Class_CodifThesaurus extends Storm_Model_Abstract {
protected $_default_attribute_values = ['libelle_facette' => ''];
public function getListeSuggestion($recherche,$mode,$limite_resultat,$theme) {
// Lancer la recherche
if($mode=="1") {
if (strlen($recherche)<3)
return [];
$req = "select distinct(id),id_thesaurus,id_origine from codif_thesaurus where id_thesaurus regexp (select group_concat(concat(id_thesaurus,'.*') separator '|') from codif_thesaurus where id_thesaurus like '".$theme."%' and id_origine is not null and libelle like '%".$recherche."%') order by id_thesaurus";
}
if($mode=="2")
$req="select id,libelle,id_origine from codif_thesaurus where id_thesaurus like '".$theme."%' and libelle like'".addslashes($recherche)."%' order by id_thesaurus limit ".$limite_resultat;
switch ((int) $mode) {
case self::MODE_HIERARCHY_CONTAINS:
if (strlen($recherche)<3)
return [];
$req = "select distinct(id),id_thesaurus,id_origine from codif_thesaurus where id_thesaurus regexp (select group_concat(concat(id_thesaurus,'.*') separator '|') from codif_thesaurus where id_thesaurus like '".$theme."%' and id_origine is not null and libelle like '%".$recherche."%') order by id_thesaurus";
break;
case self::MODE_LABEL_STARTS_WITH:
$req="select id,id_thesaurus,libelle,id_origine from codif_thesaurus where id_thesaurus like '".$theme."%' and libelle like'".addslashes($recherche)."%' order by id_thesaurus limit ".$limite_resultat;
break;
if($mode=="3")
case self::MODE_LABEL_CONTAINS:
$req="select id,libelle,id_origine from codif_thesaurus where id_thesaurus like '".$theme."%' and libelle like'%".addslashes($recherche)."%' order by id_thesaurus limit ".$limite_resultat;
break;
if ($mode=="4")
case self::MODE_INDEX_STARTS_WITH:
$req="select id,id_thesaurus,libelle,id_origine from codif_thesaurus where id_thesaurus like '".$theme."%' and id_origine like '".$recherche."%' order by id_thesaurus limit ".$limite_resultat;
break;
}
$resultat=fetchAll($req);
if (!$resultat)
return false;
return [];
foreach($resultat as $enreg) {
$thesaurus = Class_CodifThesaurus::getLoader()->find($enreg["id"]);
$libelle = Class_CodifThesaurus::getLoader()->getLibelleHierarchique($thesaurus);
$liste[] = [$enreg["id_thesaurus"],
$enreg["id_origine"]." : ".$libelle];
}
foreach($resultat as $enreg)
$liste[] = [$enreg["id_thesaurus"], $enreg["id_origine"]." : ".Class_CodifThesaurus::getLibelleHierarchique(Class_CodifThesaurus::find($enreg["id"]))];
return $liste;
}
......
tests/application/modules/admin/controllers/AjaxControllerTest.php
+ 69
− 1
View file @ 5d6311c7
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class AjaxControllerAuteurTest extends AbstractControllerTestCase {
class AjaxControllerSuggestAuteurTest extends AbstractControllerTestCase {
/** @test */
public function asAdminPortailBodyShouldContainsTagListe() {
$this->dispatch('/admin/ajax/listesuggestion/type_autorite/auteur/mode/1/valeur/1/id_champ/suggest', true);
......@@ -35,4 +35,72 @@ class AjaxControllerAuteurTest extends AbstractControllerTestCase {
}
}
class AjaxControllerSuggestThesaurusPirateTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
$this->mock_sql = $this->mock();
Zend_Registry::set('sql', $this->mock_sql);
$this->fixture('Class_CodifThesaurus', ['id' => 1,
'id_origine' => 1,
'id_thesaurus' => 'PUBL',
'libelle' => 'pirate']);
}
public function datas() {
return [
[Class_CodifThesaurus::MODE_HIERARCHY_CONTAINS,
"select distinct(id),id_thesaurus,id_origine from codif_thesaurus where id_thesaurus regexp (select group_concat(concat(id_thesaurus,'.*') separator '|') from codif_thesaurus where id_thesaurus like 'PUBL%' and id_origine is not null and libelle like '%pirate%') order by id_thesaurus"],
[Class_CodifThesaurus::MODE_LABEL_STARTS_WITH,
"select id,id_thesaurus,libelle,id_origine from codif_thesaurus where id_thesaurus like 'PUBL%' and libelle like'pirate%' order by id_thesaurus limit 100"],
[Class_CodifThesaurus::MODE_LABEL_CONTAINS,
"select id,libelle,id_origine from codif_thesaurus where id_thesaurus like 'PUBL%' and libelle like'%pirate%' order by id_thesaurus limit 100"],
[Class_CodifThesaurus::MODE_INDEX_STARTS_WITH,
"select id,id_thesaurus,libelle,id_origine from codif_thesaurus where id_thesaurus like 'PUBL%' and id_origine like 'pirate%' order by id_thesaurus limit 100"]
];
}
/**
* @test
* @dataProvider datas
*/
public function withModeShouldRunExpectedQueryAndSuggestPirate($mode, $query) {
$this->expectListQueryReturningPirate($query);
$this->dispatchWithMode($mode);
$this->assertPirateIsSuggested();
}
protected function dispatchWithMode($mode) {
$this->dispatch('/admin/ajax/listesuggestion/type_autorite/thesaurus/mode/' . $mode . '/valeur/pirate/id_champ/PUBL', true);
}
protected function assertPirateIsSuggested() {
$this->assertXPathContentContains('//div[@class="tag_liste"][@clef="1"]',
'1 : pirate',
$this->_response->getBody());
}
protected function expectListQueryReturningPirate($query) {
$this->expectListQueryReturning($query,
[['id_thesaurus' => 1,
'id_origine' => 1,
'id' => 1],]);
}
protected function expectListQueryReturning($query, $result) {
$this->mock_sql
->whenCalled('fetchAll')->with($query, false)->answers($result)
->beStrict();
}
}
?>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment