Merge branch 'hotline#57923_recherche_ressources_numeriques_depuis_nanook_316' into 'stable'

hotline #57923 fix digital library search

See merge request !2140

VERSIONS_HOTLINE/57923

+ - ticket #57923 : Correction de la recherche des ressources numériques depuis Nanook
\ No newline at end of file

library/Class/MoteurRecherche.php

@@ -87,7 +87,6 @@ class Class_MoteurRecherche {
 
     $types = array_keys(Class_TypeDoc::getDigitalDocTypes());
     $this->setCondition('(type_doc in (\'' . implode('\',\'', $types). '\'))');
-    $this->setOrConditions('(CAST(type_doc AS UNSIGNED) >= ' . Class_TypeDoc::DIGITAL_RESOURCE_THRESHOLD . ')');
   }
 
 

tests/library/Class/MoteurRechercheTest.php

@@ -308,7 +308,14 @@ class MoteurRechercheSimpleTest extends MoteurRechercheTestCase {
             [['expressionRecherche' => '',
               'digital_lib' => '1'],
              'nb_mots'=> 0,
-             'req_liste' => 'select id_notice, facettes from notices Where ((type_doc in (\'100\',\'101\',\'102\',\'103\',\'104\',\'105\',\'106\',\'107\',\'108\',\'109\',\'110\',\'111\',\'112\',\'114\',\'113\',\'115\',\'116\',\'117\',\'119\',\'Assimil\'))) or (CAST(type_doc AS UNSIGNED) >= 100)'],
+             'req_liste' => 'select id_notice, facettes from notices Where (type_doc in (\'100\',\'101\',\'102\',\'103\',\'104\',\'105\',\'106\',\'107\',\'108\',\'109\',\'110\',\'111\',\'112\',\'114\',\'113\',\'115\',\'116\',\'117\',\'119\',\'Assimil\'))'],
+
+
+            [['expressionRecherche' => 'logo',
+              'digital_lib' => '1'],
+             'nb_mots'=> 1,
+             'req_liste' => "select id_notice, facettes from notices Where " . $match_axes . " AGAINST('+(LOGO LOGOS LOGO)' IN BOOLEAN MODE) and (type_doc in ('100','101','102','103','104','105','106','107','108','109','110','111','112','114','113','115','116','117','119','Assimil')) order by (MATCH(alpha_titre) AGAINST(' LOGO') * 1.5) + (MATCH(alpha_auteur) AGAINST(' LOGO')) desc"],
+
 
             [['expressionRecherche' => '',
               'id_panier' => 4],