Evolution #166: La recherche

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -299,12 +299,17 @@ class SearchController extends Controller
     $form = $this->getGlobalSearchForm($searcher = new GlobalSearcher());
     $form->bindRequest($request);
     $results = array(
-      'users'  => null,
-      'groups' => null
+      'users'    => null,
+      'groups'   => null,
+      'elements' => null
     );
     if ($form->isValid())
     {
-      $results = $searcher->getResults($this->getDoctrine());
+      $results = $searcher->getResults(
+        $this->getDoctrine(), 
+        $this->getUserId(),
+        $this->container->getParameter('search_global_elements_word_min_length')
+      );
     }
     
     return array(

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -34,7 +34,7 @@ class ElementRepository extends EntityRepository
    * @param ElementSearcher $searcher
    * @return Doctrine\ORM\Query
    */
-  public function findBySearch(ElementSearcher $searcher, $user_id, $exec_type = 'execute')
+  public function findBySearch(ElementSearcher $searcher, $user_id, $exec_type = 'execute', $params = array())
   {
     // Tableaux des paramétres
     $params_ids = array();
@@ -62,6 +62,68 @@ class ElementRepository extends EntityRepository
       return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), null, null, $searcher->getIdsDisplay());
     }
     
+    // Si c'est une recherche string, les autres paramètres ne sont pas nécéssaire
+    if (($string = $searcher->getString()))
+    {
+      // On prépare notre liste de mots
+      $words = array_unique(array_merge(
+        explode(' ', $string),
+        explode('-', $string),
+        explode('- ', $string),
+        explode(' -', $string),
+        explode(' - ', $string),
+        explode(',', $string),
+        explode(', ', $string),
+        explode(' ,', $string),
+        explode(' , ', $string)
+      ));
+      
+      // On récupère les ids des elements correspondants
+      $where_string = "WHERE 1 = 2";
+      $params_string = array();
+      $word_min_length = 0;
+      if (isset($params['word_min_length']))
+      {
+        $word_min_length = $params['word_min_length'];
+      }
+      foreach ($words as $i => $word)
+      {
+        if (strlen($word) >= $word_min_length)
+        {
+          if ($where_string === "WHERE 1 = 2")
+          {
+            $where_string = " WHERE UPPER(e.name) LIKE :str".$i;
+          }
+          else
+          {
+            $where_string .= " OR UPPER(e.name) LIKE :str".$i;
+          }
+          $params_string['str'.$i] = '%'.strtoupper($word).'%';
+        }
+      }
+      
+      $ids_result = $this->getEntityManager()
+        ->createQuery("SELECT e.id FROM MuzichCoreBundle:Element e
+           $where_string
+           GROUP BY e.id
+           ORDER BY e.created DESC, e.id DESC
+        ")->setParameters($params_string)->getScalarResult()
+      ;
+      $ids = array();
+      foreach ($ids_result as $id_record)
+      {
+        $ids[] = $id_record['id'];
+      }
+      
+      if (count($ids))
+      {
+        return $this->getSelectElementForSearchQuery($params_select, $user_id, $ids);
+      }
+      return $query = $this->getEntityManager()
+        ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
+      ;
+    }
+    
     
     // Booléen nous permettant de savoir si un where a déjà été écrit
     $is_where = false;

src/Muzich/CoreBundle/Resources/views/GlobalSearch/results.html.twig

@@ -8,7 +8,7 @@
   
   {% include "MuzichCoreBundle:GlobalSearch:form.html.twig" with {'form': form } %}
   
-  {% if results.users|length or results.groups|length %}
+  {% if results.users|length or results.groups|length or results.elements|length %}
   
     {% if results.users %}
 
@@ -38,6 +38,17 @@
 
     {% endif %}
   
+    {% if results.elements %}
+      
+      {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
+        'noelements_filter' : true,
+        'elements'          : results.elements
+      }%}
+      
+    {% endif %}
+      
+  {% else %}
+      
   {% endif %}
 
 {% endblock %}

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -101,6 +101,14 @@ class ElementSearcher extends Searcher implements SearcherInterface
   protected $tag_strict = false;
   
   /**
+   * A renseigné pour une recherche portant sur les nom
+   * 
+   * @var string 
+   */
+  protected $string = null;
+  
+  
+  /**
    * @see SearcherInterface
    * @param array $params 
    */
@@ -115,7 +123,7 @@ class ElementSearcher extends Searcher implements SearcherInterface
     $this->setAttributes(array(
       'network', 'tags', 'count', 'user_id', 'group_id', 
       'favorite', 'id_limit', 'searchnew', 'ids', 'ids_display',
-      'tag_strict'
+      'tag_strict', 'string'
     ), $params);
     
   }
@@ -130,7 +138,7 @@ class ElementSearcher extends Searcher implements SearcherInterface
     $this->setAttributes(array(
       'network', 'tags', 'count', 'user_id', 'group_id', 
       'favorite', 'id_limit', 'searchnew', 'ids', 'ids_display',
-      'tag_strict'
+      'tag_strict', 'string'
     ), $params);
   }
   
@@ -150,7 +158,8 @@ class ElementSearcher extends Searcher implements SearcherInterface
       'favorite'    => $this->isFavorite(),
       'ids'         => $this->getIds(),
       'ids_display' => $this->getIdsDisplay(),
-      'tag_strict'  => $this->getTagStrict()
+      'tag_strict'  => $this->getTagStrict(),
+      'string'      => $this->getString()
     );
   }
   
@@ -255,6 +264,16 @@ class ElementSearcher extends Searcher implements SearcherInterface
   {
     return $this->tag_strict;
   }
+  
+  public function setString($string)
+  {
+    $this->string = $string;
+  }
+  
+  public function getString()
+  {
+    return $this->string;
+  }
 
   /**
    * Construction de l'objet Query
@@ -265,11 +284,11 @@ class ElementSearcher extends Searcher implements SearcherInterface
    * 
    * @return collection
    */
-  protected function constructQueryObject(Registry $doctrine, $user_id, $exec_type = 'execute')
+  protected function constructQueryObject(Registry $doctrine, $user_id, $exec_type = 'execute', $params = array())
   {
     $this->setQuery($doctrine
       ->getRepository('MuzichCoreBundle:Element')
-      ->findBySearch($this, $user_id, $exec_type))
+      ->findBySearch($this, $user_id, $exec_type, $params))
     ;
   }
   
@@ -282,9 +301,9 @@ class ElementSearcher extends Searcher implements SearcherInterface
    * 
    * @return collection
    */
-  public function getQuery(Registry $doctrine, $user_id, $exec_type = 'execute')
+  public function getQuery(Registry $doctrine, $user_id, $exec_type = 'execute', $params = array())
   {
-    $this->constructQueryObject($doctrine, $user_id, $exec_type);
+    $this->constructQueryObject($doctrine, $user_id, $exec_type, $params);
     return $this->query;
   }
 
@@ -298,9 +317,9 @@ class ElementSearcher extends Searcher implements SearcherInterface
    * 
    * @return collection
    */
-  public function getElements(Registry $doctrine, $user_id, $exec_type = 'execute')
+  public function getElements(Registry $doctrine, $user_id, $exec_type = 'execute', $params = array())
   {
-    $query = $this->getQuery($doctrine, $user_id, $exec_type);
+    $query = $this->getQuery($doctrine, $user_id, $exec_type, $params);
     
     switch ($exec_type)
     {

src/Muzich/CoreBundle/Searcher/GlobalSearcher.php

@@ -5,6 +5,7 @@ namespace Muzich\CoreBundle\Searcher;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Bundle\DoctrineBundle\Registry;
 use Muzich\CoreBundle\Searcher\UserAndGroupSearcher;
+use Muzich\CoreBundle\Searcher\ElementSearcher;
 
 /**
  * 
@@ -50,19 +51,25 @@ class GlobalSearcher extends Searcher implements SearcherInterface
    * @param Registry $doctrine
    * @return array
    */
-  public function getResults(Registry $doctrine)
+  public function getResults(Registry $doctrine, $user_id, $min_word_length = null)
   {
-    $ug_searcher = new UserAndGroupSearcher();
-    $ug_searcher->setString($this->string);
-    
-    
-    // instancier objet SearchUser and groups;
-    // puis faire recherche sur elements
-    
     // On remplace le caratcère '%' au cas ou un malin l'insére.
     $string = str_replace('%', '#', $this->string);
+    // instancier objet SearchUser and groups;
+    $ugs = new UserAndGroupSearcher();
+    $ugs->setString($this->string);
     
-    return $ug_searcher->getResults($doctrine);
+    // puis on fait recherche sur elements
+    $es = new ElementSearcher();
+    $es->init(array('string' => $string));
+    $results = $ugs->getResults($doctrine);
+    $results['elements'] = $es->getElements(
+      $doctrine, 
+      $user_id, 
+      'execute',
+      array('word_min_length' => $min_word_length)
+    );
+    return $results;
   }