VERSIONS_HOTLINE/158802

+ - correctif #158802 : Recherche : amélioration de la performance des recherches avec un domaine lié.
+                       Magasin de thèmes: ajout d'un nouveau paramètre dans les boites de type carrousel pour désynchroniser l'affichage du contenu de celle-ci de l'affichage de la page.
\ No newline at end of file

VERSIONS_WIP/156659

+ - fonctionnalité #156659 : Magasin de thèmes : Ajout des classes "users_count" et "documents_count" sur les indicateurs de comptage dans la description de la fiche bibliothèque.
\ No newline at end of file

application/modules/opac/controllers/WidgetController.php

@@ -21,6 +21,7 @@
 
 
 class WidgetController extends ZendAfi_Controller_Action {
+
   public function renderAction() {
     $callback = function() {
 
@@ -32,11 +33,17 @@ class WidgetController extends ZendAfi_Controller_Action {
 
       Class_Template::setCurrentFrom($profile_id);
 
-      if ($widget = $this->_findWidgetBy($id, $profile_id))
-        return Class_Template::current()->renderWidget($widget, $this->view);
+      if ( ! $widget = $this->_findWidgetBy($id, $profile_id))
+        return '';
+
+      return ('body' === $this->_getParam('only', '')
+              ? Class_Template::current()->renderWidgetBody($widget, $this->view)
+              : Class_Template::current()->renderWidget($widget, $this->view));
     };
 
-    return $this->_helper->iframe($callback);
+    return ('ajax' == $this->_request->getParam('render'))
+      ? $this->_helper->ajax($callback)
+      : $this->_helper->iframe($callback);
   }
 
 

library/Class/MoteurRecherche.php

@@ -262,7 +262,18 @@ class Class_MoteurRecherche {
 
 
   public function visitFiltre($filtre) {
-    $this->all_facettes .= ' +(' . implode(' ', $filtre) . ') ';
+    $this->all_facettes .= $this->_optimizedFacetsForMatchAgaints($filtre);
+  }
+
+
+  protected function _optimizedFacetsForMatchAgaints(array $facets) : string {
+    if ( ! $facets)
+      return '';
+
+    return sprintf(' +%s ',
+                   (1 === count($facets)
+                    ? reset($facets)
+                    : '(' . implode(' ', $facets) . ')'));
   }
 
 
@@ -506,7 +517,7 @@ class Class_MoteurRecherche {
 
   protected function injectMultiFacets() {
     foreach($this->multi_facets as $facets)
-      $this->all_facettes .= ' +(' . implode(' ', $facets) . ')';
+      $this->all_facettes .= $this->_optimizedFacetsForMatchAgaints($facets);
   }
 
 

library/Class/Systeme/Widget/Abstract.php

@@ -547,4 +547,14 @@ abstract class Class_Systeme_Widget_Abstract extends Class_Entity {
       ? $id
       : $parent_id . '_' . $id;
   }
+
+
+  public function setShouldRender(bool $value) : self {
+    return $this->set('should_render', $value);
+  }
+
+
+  public function getShouldRender() : bool {
+    return (bool) $this->get('should_render');
+  }
 }

library/ZendAfi/Form.php

@@ -257,6 +257,18 @@ class ZendAfi_Form extends Zend_Form {
   }
 
 
+  public function addToTemplateGroup(array $elements) : self {
+    $key = Class_Template::current()->withNameSpace('group');
+
+    return ($group = $this->getDisplayGroup($key))
+      ? $this->addToDisplayGroup($elements, $key)
+      : $this->addDisplayGroup($elements,
+                               $key,
+                               ['legend' => $this->_('Thème'),
+                                'order' => Intonation_Library_FormCustomizer_Abstract::FIRST]);
+  }
+
+
   public function addToDisplaySettingsGroup($elements) {
     $key = 'display_settings_group';
     if($group = $this->getDisplayGroup($key))

library/ZendAfi/View/Helper/Template/Base.php

@@ -89,6 +89,13 @@ class ZendAfi_View_Helper_Template_Base extends ZendAfi_View_Helper_BaseHelper {
   }
 
 
+  public function getBodyHtml() : string {
+    return $this->_view_helper
+      ->setTemplateContext($this)
+      ->getBodyHtml();
+  }
+
+
   protected function _initLegacyHtml() {
     $this->_view_helper
       ->setTemplateContext($this)
@@ -139,6 +146,11 @@ class ZendAfi_View_Helper_Template_Base extends ZendAfi_View_Helper_BaseHelper {
   }
 
 
+  public function shouldRender() : bool {
+    return $this->_widget->getShouldRender();
+  }
+
+
   protected function _visibleWhenHidden() {
     return $this->_view_helper->visibleWhenHidden();
   }

library/ZendAfi/View/Helper/Template/LoadingIcon.php

@@ -22,7 +22,7 @@
 
 class ZendAfi_View_Helper_Template_LoadingIcon extends ZendAfi_View_Helper_BaseHelper {
   public function loadingIcon() : string {
-    return $this->_div(['class' => 'col-12 text-center'],
+    return $this->_div(['class' => 'col-12 text-center loading_icon_wrapper'],
                        $this->_div(['class' => 'loading_icon'],
                                    $this->view->screenReaderOnly($this->_('Merci de patientier...'))));
   }

library/templates/Intonation/Library/View/Wrapper/Library/RichContent/Details.php

@@ -39,10 +39,12 @@ class Intonation_Library_View_Wrapper_Library_RichContent_Details extends Intona
     return $this->_view->renderLibrary($this->_model, ['fields' => $fields])
 
       . $this->_view->tag('p',
-                          $this->_('Nombre d\'utilisateurs : %d', $number_of_users))
+                          $this->_('Nombre d\'utilisateurs : %d', $number_of_users),
+                          ['class' => 'users_count'])
 
       . $this->_view->tag('p',
-                          $this->_('Nombre de documents : %d', $number_of_documents))
+                          $this->_('Nombre de documents : %d', $number_of_documents),
+                          ['class' => 'documents_count'])
 
       . $this->_renderInformations()
 

library/templates/Intonation/Library/Widget/Carousel/Form.php

@@ -133,7 +133,11 @@ class Intonation_Library_Widget_Carousel_Form extends ZendAfi_Form_Configuration
                     'value' => 0,
                     'min' => 0,
                     'max' => 60])
-      ;
+
+      ->addExpertElement('checkbox',
+                         'delayed',
+                         ['label' => $this->_('Affichage du contenu désynchronisé'),
+                          'value' => 0]);
   }
 
 
@@ -141,7 +145,6 @@ class Intonation_Library_Widget_Carousel_Form extends ZendAfi_Form_Configuration
     parent::initDisplayGroups();
 
     $this
-
       ->addToSelectionGroup(['data_sources'])
 
       ->addToDisplaySettingsGroup(['layout',
@@ -162,7 +165,7 @@ class Intonation_Library_Widget_Carousel_Form extends ZendAfi_Form_Configuration
       ->addToDisplayGroup(['description_length',
                            'description_html'],
                           Class_Template::current()->withNameSpace('group'))
-      ;
+      ->addToTemplateGroup(['delayed']);
 
     return $this;
   }

library/templates/Intonation/Library/Widget/Carousel/Record/View.php

@@ -24,6 +24,7 @@ class Intonation_Library_Widget_Carousel_Record_View extends Intonation_Library_
 
   protected static $_storm_limit = 100;
 
+
   protected function _findElements() {
     $order = $this->_settings->getOrder();
 
@@ -146,6 +147,6 @@ class Intonation_Library_Widget_Carousel_Record_View extends Intonation_Library_
   protected function _getSize() {
     return ($size = $this->_settings->getSize())
       ? $size
-      : 100;
+      : static::$_storm_limit;
   }
 }

library/templates/Intonation/Library/Widget/Carousel/View.php

@@ -24,7 +24,6 @@ abstract class Intonation_Library_Widget_Carousel_View extends Zendafi_View_Help
 
   protected $_template_context;
 
-
   protected static $_helper_by_layout =
     [Intonation_Library_Widget_Carousel_Definition::WALL => Intonation_View_RenderWall::class,
      Intonation_Library_Widget_Carousel_Definition::CAROUSEL => ZendAfi_View_Helper_Template_LayoutCarousel::class,
@@ -182,12 +181,37 @@ abstract class Intonation_Library_Widget_Carousel_View extends Zendafi_View_Help
 
 
   protected function _getHTML() {
+    return $this->_isDelayed()
+      ? $this->_renderDelayed()
+      : $this->getBodyHTML();
+  }
+
+
+  public function getBodyHTML() : string {
     return ($elements = $this->_findElements())
       ? $this->_renderElements($elements)
       : $this->_emptyListMessage();
   }
 
 
+  protected function _isDelayed() : bool {
+    return $this->_settings->isDelayed();
+  }
+
+
+  protected function _renderDelayed () : string {
+    return $this->view->loadingIcon()
+      . $this->view->delayedLoad('widget',
+                                 'render',
+                                 ['render' => 'ajax',
+                                  'only' => 'body',
+                                  'widget_id' => $this->getId(),
+                                  'profile_id' => Class_Profil::getCurrentProfil()->getId()],
+                                 sprintf('$("#boite_%s").find(".loading_icon_wrapper").remove();',
+                                         $this->getIdModule()));
+  }
+
+
   protected function _renderElements($elements) {
     $content_callback = $this->_getContentCallback($this->_settings->getRendering());
 

library/templates/Intonation/System/Abstract.php

@@ -49,6 +49,13 @@ abstract class Intonation_System_Abstract {
   }
 
 
+  public function renderBodyOn($view) : string {
+    return ($helper = $this->_getViewHelper($view))
+      ? $helper->getBodyHtml()
+      : '';
+  }
+
+
   public function getIdForHtml() : string {
     $parent_id = ($parent = $this->getParentInstance())
       ? ($parent->getIdForHtml())

library/templates/Intonation/System/WidgetSettings.php

@@ -56,4 +56,9 @@ class Intonation_System_WidgetSettings {
       ? $id
       : $parent_id . '_' . $id;
   }
+
+
+  public function isDelayed() : bool {
+    return (bool) $this->_settings->getDelayed();
+  }
 }

library/templates/Intonation/Template.php

@@ -52,10 +52,16 @@ class Intonation_Template extends Class_Template {
   }
 
 
+  public function renderWidgetBodyOn($instance, $view) {
+    return $instance->renderBodyOn($view);
+  }
+
+
   public function renderWidget($widget, $view) {
     Class_AnchorTarget::setTarget($widget->getAnchorTarget());
 
     $widget
+      ->setShouldRender(true)
       ->setMenuAdminLinksHelper($view)
       ->setSection(new Class_Entity);
 
@@ -63,6 +69,17 @@ class Intonation_Template extends Class_Template {
   }
 
 
+  public function renderWidgetBody($widget, $view) {
+    Class_AnchorTarget::setTarget($widget->getAnchorTarget());
+
+    $widget
+      ->setMenuAdminLinksHelper($view)
+      ->setSection(new Class_Entity);
+
+    return $this->renderWidgetBodyOn((new Intonation_System_Widget($this))->setSettings($widget), $view);
+  }
+
+
   public function handleRecordView() {
     return true;
   }

tests/application/modules/opac/controllers/RechercheControllerTest.php

@@ -3741,7 +3741,7 @@ class RechercheControlleSimpleActionWithMultifacetsThesauriTest extends Recherch
 
     $this->mock_sql
       ->whenCalled('fetchAll')
-      ->with("select id_notice, facettes from notices Where (MATCH(facettes) AGAINST('+(HDOCU0001 HDOCU0002 HDOCU00020001) +(HMUSI0001)' IN BOOLEAN MODE)) and type=1", true, false)
+      ->with("select id_notice, facettes from notices Where (MATCH(facettes) AGAINST('+(HDOCU0001 HDOCU0002 HDOCU00020001)  +HMUSI0001' IN BOOLEAN MODE)) and type=1", true, false)
       ->answers([  [1, ''] ])
 
       ->whenCalled('fetchOne')

tests/library/Class/MoteurRechercheTest.php

@@ -112,7 +112,7 @@ class MoteurRechercheAvanceeTest extends MoteurRechercheTestCase {
               'type_recherche' => 'nimportequoi',
               'pertinence' => false,
               'tri' => 'alpha_titre'],
-             'req_notices' => $this->listSqlWith("date_creation >'2012-02-03' and (MATCH(titres) AGAINST('+(NOUVEAU NOUVEAUX NOUVO) +(CHIEN CHIENS CHIN) +(GARDE GARDES GARD)' IN BOOLEAN MODE) or MATCH(editeur) AGAINST('+(RAISON RAISONS RAISON) +(AGIR AGIRS AJIR)' IN BOOLEAN MODE)) and MATCH(facettes) AGAINST('+(B4)' IN BOOLEAN MODE)",
+             'req_notices' => $this->listSqlWith("date_creation >'2012-02-03' and (MATCH(titres) AGAINST('+(NOUVEAU NOUVEAUX NOUVO) +(CHIEN CHIENS CHIN) +(GARDE GARDES GARD)' IN BOOLEAN MODE) or MATCH(editeur) AGAINST('+(RAISON RAISONS RAISON) +(AGIR AGIRS AJIR)' IN BOOLEAN MODE)) and MATCH(facettes) AGAINST('+B4' IN BOOLEAN MODE)",
                                                  'alpha_titre')],
 
             [['rech_auteurs' => 'Foucault',
@@ -213,7 +213,7 @@ class MoteurRechercheAvanceeTest extends MoteurRechercheTestCase {
               'type_recherche' => 'commence',
               'pertinence' => true,
               'tri' => 'alpha_titre'],
-             'req_notices' => $this->listSqlWith("(auteurs like 'STIEGLER%') and MATCH(facettes) AGAINST('+YMED1 +G23 +A345 +(T1 Tbokeh_page)  +(YTUN YTAP)  +(S1 S12 S9)  +(B3)' IN BOOLEAN MODE)",
+             'req_notices' => $this->listSqlWith("(auteurs like 'STIEGLER%') and MATCH(facettes) AGAINST('+YMED1 +G23 +A345 +(T1 Tbokeh_page)  +(YTUN YTAP)  +(S1 S12 S9)  +B3' IN BOOLEAN MODE)",
                                                  'alpha_titre')]
     ];
   }
@@ -329,7 +329,7 @@ class MoteurRechercheSimpleTest extends MoteurRechercheTestCase {
               'geo_bib' => 3,
               'tri' => 'alpha_auteur'] ,
              'nb_mots'=> null,
-             'req_liste' => $this->listSqlWith("(isbn='2-7427-3315-9' or isbn='978-2-7427-3315-6') and MATCH(facettes) AGAINST('+(B3)' IN BOOLEAN MODE)",
+             'req_liste' => $this->listSqlWith("(isbn='2-7427-3315-9' or isbn='978-2-7427-3315-6') and MATCH(facettes) AGAINST('+B3' IN BOOLEAN MODE)",
                                                "alpha_auteur")],
 
             [['expressionRecherche' => '9782742761579'],
@@ -346,7 +346,7 @@ class MoteurRechercheSimpleTest extends MoteurRechercheTestCase {
             [['expressionRecherche' => '9782742761579',
               'selection_bib'=> 1],
              'nb_mots'=> null,
-             'req_liste' => $this->listSqlWith("(isbn='2-7427-6157-8' or isbn='978-2-7427-6157-9') and MATCH(facettes) AGAINST('+(B1)' IN BOOLEAN MODE)")],
+             'req_liste' => $this->listSqlWith("(isbn='2-7427-6157-8' or isbn='978-2-7427-6157-9') and MATCH(facettes) AGAINST('+B1' IN BOOLEAN MODE)")],
 
             [['expressionRecherche' => 'logo',
               'annexe' => 'MED1',
@@ -360,7 +360,7 @@ class MoteurRechercheSimpleTest extends MoteurRechercheTestCase {
             [['expressionRecherche' => 'logo',
               'multifacets' => 'Tper_title'],
              'nb_mots'=> 1,
-             'req_liste' => $this->listSqlWith($match_axes . " AGAINST('+(LOGO LOGOS LOGO)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+(Tper_title)' IN BOOLEAN MODE)",
+             'req_liste' => $this->listSqlWith($match_axes . " AGAINST('+(LOGO LOGOS LOGO)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+Tper_title' IN BOOLEAN MODE)",
                                                "MATCH(auteurs) AGAINST('P_LOGO') desc, MATCH(titres) AGAINST('P_LOGO') desc, MATCH(titres) AGAINST('LOGO') desc, MATCH(auteurs) AGAINST('LOGO') desc, date_creation desc")],
 
             [['expressionRecherche' => 'security',
@@ -372,7 +372,7 @@ class MoteurRechercheSimpleTest extends MoteurRechercheTestCase {
               'type_doc' => 'delete("*"),1,uraiets,2',
               'selection_sections' => '1;goup<ip;9'],
              'nb_mots'=> 1,
-             'req_liste' => $this->listSqlWith($match_axes . " AGAINST('+(SECURITY SECURITYS SEKURITI)' IN BOOLEAN MODE) and  type_doc in('1','2') and MATCH(facettes) AGAINST('+(Y8)  +(S1 S9)  +(E34)  +(B12)' IN BOOLEAN MODE)",
+             'req_liste' => $this->listSqlWith($match_axes . " AGAINST('+(SECURITY SECURITYS SEKURITI)' IN BOOLEAN MODE) and  type_doc in('1','2') and MATCH(facettes) AGAINST('+Y8  +(S1 S9)  +E34  +B12' IN BOOLEAN MODE)",
                                                "MATCH(auteurs) AGAINST('P_SECURITY') desc, MATCH(titres) AGAINST('P_SECURITY') desc, MATCH(titres) AGAINST('SECURITY') desc, MATCH(auteurs) AGAINST('SECURITY') desc, date_creation desc")],
 
             [['expressionRecherche' => '',
@@ -402,7 +402,7 @@ class MoteurRechercheSimpleTest extends MoteurRechercheTestCase {
             // see http://forge.afi-sa.fr/issues/46007
             [['filtres' => 'T1;-HFOND0003*;'],
              'nb_mots'=> 0,
-             'req_liste' => $this->listSqlWith('MATCH(facettes) AGAINST(\'+(T1)  +(HFOND0003*)\' IN BOOLEAN MODE)')],
+             'req_liste' => $this->listSqlWith('MATCH(facettes) AGAINST(\'+T1  +HFOND0003*\' IN BOOLEAN MODE)')],
 
             // see http://forge.afi-sa.fr/issues/111788
             [['expressionRecherche' => 'coeur cabossés',
@@ -560,7 +560,7 @@ class MoteurRechercheRebondTest extends MoteurRechercheTestCase {
               'tri' => 'alpha_titre',
               'code_rebond' => 'A888',
               'geo_bib' => 3] ,
-             'req_liste' => $this->listSqlWith("MATCH(facettes) AGAINST('+A888 +(B3)' IN BOOLEAN MODE)", "alpha_titre")],
+             'req_liste' => $this->listSqlWith("MATCH(facettes) AGAINST('+A888 +B3' IN BOOLEAN MODE)", "alpha_titre")],
 
 
             [['rech_auteurs' => 'Fred Frith',
@@ -605,7 +605,7 @@ class MoteurRechercheRebondTest extends MoteurRechercheTestCase {
               'rubrique' =>'P4',
               'selection_annexe' => ' ',
               'geo_bib' => 3] ,
-             'req_liste' => $this->listSqlWith("MATCH(facettes) AGAINST('+A888 +(B3)' IN BOOLEAN MODE)", "alpha_titre")]];
+             'req_liste' => $this->listSqlWith("MATCH(facettes) AGAINST('+A888 +B3' IN BOOLEAN MODE)", "alpha_titre")]];
   }
 
 
@@ -881,7 +881,7 @@ class MoteurRechercheCatalogueTest extends MoteurRechercheTestCase {
 
        [['id_catalogue' => 101],
         '',
-        $this->listSqlWith("MATCH(facettes) AGAINST('+(T1)  +(HFOND0003*)' IN BOOLEAN MODE)",
+        $this->listSqlWith("MATCH(facettes) AGAINST('+T1  +HFOND0003*' IN BOOLEAN MODE)",
                            "annee desc, alpha_titre asc")]
       ];
   }
@@ -915,7 +915,7 @@ class MoteurRechercheCatalogueTest extends MoteurRechercheTestCase {
 
     $this->mock_sql
       ->whenCalled('fetchAll')
-      ->with($this->listSqlWith("date_creation >'2012-05-03' and MATCH(facettes) AGAINST('+(YANNECY YSEYNOD)  +(HNANA0001 HNANA0002)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+(HNANA0001 HNANA0002) +(F565)' IN BOOLEAN MODE)",
+      ->with($this->listSqlWith("date_creation >'2012-05-03' and MATCH(facettes) AGAINST('+(YANNECY YSEYNOD)  +(HNANA0001 HNANA0002)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+(HNANA0001 HNANA0002)  +F565' IN BOOLEAN MODE)",
                                 "annee desc, alpha_titre asc"),
              true,
              false)

tests/scenarios/Numel/NumelMapTest.php

@@ -19,9 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-abstract class NumelKioskMapTestCase extends AbstractControllerTestCase {
-    protected $_storm_default_to_volatile = true;
 
+abstract class NumelKioskMapTestCase extends AbstractControllerTestCase {
 
   public function setUp() {
     parent::setUp();
@@ -227,7 +226,7 @@ class NumelKioskMapLimit1000Test extends AbstractControllerTestCase {
                                     $preferences)
          ->assertSave();
 
-    $this->dispatch('/opac/index');
+    $this->dispatch('/index');
   }
 
 

tests/scenarios/SearchResult/SearchResultTest.php

@@ -131,7 +131,7 @@ class SearhResultFilterDomainsFromProfilTest extends AbstractControllerTestCase
 
     $sql = $this->mock()
                 ->whenCalled('fetchAll')
-                ->with("select id_notice, facettes from notices Where (MATCH(titres, auteurs, editeur, collection, matieres, dewey, other_terms) AGAINST('+(TROLL TROLLS TROL) +(TROY TROYS TROI)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+(T2)  +(HCCCC0001 HCCCC0002)' IN BOOLEAN MODE)) and type=1 order by MATCH(titres, auteurs) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(editeur, collection, matieres, dewey, other_terms) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(auteurs) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('TROLLS TROY') desc, MATCH(auteurs) AGAINST('TROLLS TROY') desc, date_creation desc", true, false)
+                ->with("select id_notice, facettes from notices Where (MATCH(titres, auteurs, editeur, collection, matieres, dewey, other_terms) AGAINST('+(TROLL TROLLS TROL) +(TROY TROYS TROI)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+T2  +(HCCCC0001 HCCCC0002)' IN BOOLEAN MODE)) and type=1 order by MATCH(titres, auteurs) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(editeur, collection, matieres, dewey, other_terms) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(auteurs) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('TROLLS TROY') desc, MATCH(auteurs) AGAINST('TROLLS TROY') desc, date_creation desc", true, false)
                 ->answers([ ['1', 'T1 T2']])
                 ->beStrict();
 
@@ -162,7 +162,7 @@ class SearchResultFilterFromProfilTest extends AbstractControllerTestCase {
 
     $sql = $this->mock()
                 ->whenCalled('fetchAll')
-                ->with("select id_notice, facettes from notices Where (MATCH(titres, auteurs, editeur, collection, matieres, dewey, other_terms) AGAINST('+(TROLL TROLLS TROL) +(TROY TROYS TROI)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+(T2)' IN BOOLEAN MODE)) and type=1 order by MATCH(titres, auteurs) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(editeur, collection, matieres, dewey, other_terms) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(auteurs) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('TROLLS TROY') desc, MATCH(auteurs) AGAINST('TROLLS TROY') desc, date_creation desc", true, false)
+                ->with("select id_notice, facettes from notices Where (MATCH(titres, auteurs, editeur, collection, matieres, dewey, other_terms) AGAINST('+(TROLL TROLLS TROL) +(TROY TROYS TROI)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+T2' IN BOOLEAN MODE)) and type=1 order by MATCH(titres, auteurs) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(editeur, collection, matieres, dewey, other_terms) AGAINST('\\\"TROLLS DE TROY\\\"' IN BOOLEAN MODE) desc, MATCH(auteurs) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('P_TROLLS P_TROY') desc, MATCH(titres) AGAINST('TROLLS TROY') desc, MATCH(auteurs) AGAINST('TROLLS TROY') desc, date_creation desc", true, false)
                 ->answers([ ['1' , 'T1 T2']]);
 
     Zend_Registry::set('sql', $sql);
@@ -219,7 +219,7 @@ class SearchResultFilterFromProfilOnDomainTest extends AbstractControllerTestCas
 
     $sql = $this->mock()
                 ->whenCalled('fetchAll')
-                ->with("select id_notice, facettes from notices Where (date_creation >'2017-04-13' and MATCH(facettes) AGAINST('+(B1)  +(E36 E112)  +(HNNNN0001)' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+(T2)  +(B1)' IN BOOLEAN MODE)) and type=1 order by annee desc, alpha_titre asc", true, false)
+                ->with("select id_notice, facettes from notices Where (date_creation >'2017-04-13' and MATCH(facettes) AGAINST('+B1  +(E36 E112)  +HNNNN0001' IN BOOLEAN MODE) and MATCH(facettes) AGAINST('+T2  +B1' IN BOOLEAN MODE)) and type=1 order by annee desc, alpha_titre asc", true, false)
                 ->answers([ [1, 'T1 T2 B1 HNNNN0001 E36 A332'] ])
                 ->beStrict();
 

tests/scenarios/Templates/TemplatesLibraryNoveltiesTabTest.php

@@ -256,7 +256,7 @@ abstract class TemplatesLibraryNoveltiesTabWithAutoSelectionTestCase extends Abs
       ->mock()
 
       ->whenCalled('fetchAll')
-      ->with('select id_notice, facettes from notices Where (MATCH(facettes) AGAINST(\'+(B1)\' IN BOOLEAN MODE)) and type=1 order by url_image="no", url_image="", date_creation desc, alpha_titre asc limit 20', true, false)
+      ->with('select id_notice, facettes from notices Where (MATCH(facettes) AGAINST(\'+B1\' IN BOOLEAN MODE)) and type=1 order by url_image="no", url_image="", date_creation desc, alpha_titre asc limit 20', true, false)
       ->answers([[789, '']])
 
       ->beStrict();
@@ -334,7 +334,7 @@ class TemplatesLibraryNoveltiesTabWidgetRenderAllTest extends TemplatesLibraryNo
     $sql = Zend_Registry::get('sql')
 
       ->whenCalled('fetchAll')
-      ->with('select id_notice, facettes from notices Where (MATCH(facettes) AGAINST(\'+(B1)\' IN BOOLEAN MODE)) and type=1 order by url_image="no", url_image="", date_creation desc, alpha_titre asc limit 1000', true, false)
+      ->with('select id_notice, facettes from notices Where (MATCH(facettes) AGAINST(\'+B1\' IN BOOLEAN MODE)) and type=1 order by url_image="no", url_image="", date_creation desc, alpha_titre asc limit 1000', true, false)
       ->answers([[789, '']]);
 
     $this->dispatch('widget/render-all/profile_id/23/widget_id/bib_novelties_1');