Evolution #166: La recherche

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -83,8 +83,6 @@ class ElementRepository extends EntityRepository
       ));
       
       // 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']))
       {
@@ -94,50 +92,21 @@ class ElementRepository extends EntityRepository
       {
         if (strlen($word) >= $word_min_length)
         {
-          $where_string = ($is_where) ? ' AND (' : ' WHERE (';
-          $is_where = true;
-          if ($where_string === ' AND (' || $where_string === ' WHERE (')
+          if ($where_string === '')
           {
+            $where_string = ($is_where) ? ' AND (' : ' WHERE (';
+            $is_where = true;
             $where_string .= "UPPER(e_.name) LIKE :str".$i;
           }
           else
           {
             $where_string .= " OR UPPER(e_.name) LIKE :str".$i;
           }
-          //$params_string['str'.$i] = '%'.strtoupper($word).'%';
           $params_ids['str'.$i] = '%'.strtoupper($word).'%';
         }
       }
       $where_string .= ')';
       
-//      $ids_query = $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)
-//      ;
-//      
-//      $ids_query->setMaxResults($searcher->getCount());
-//      $ids_result = $ids_query->getScalarResult();
-//      
-//      $ids = array();
-//      foreach ($ids_result as $id_record)
-//      {
-//        $ids[] = $id_record['id'];
-//      }
-//      
-//      if (count($ids))
-//      {
-//        if (($id_limit = $searcher->getIdLimit()))
-//        {
-//          $this->getSelectElementForSearchQuery($params_select, $user_id, $ids, $id_limit);
-//        }
-//        return $this->getSelectElementForSearchQuery($params_select, $user_id, $ids);
-//      }
-//      return $query = $this->getEntityManager()
-//        ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
-//      ;
     }
     
     

src/Muzich/CoreBundle/Tests/Controller/MynetworkControllerTest.php

@@ -79,6 +79,16 @@ class MynetworkControllerTest extends FunctionalTest
     
     $this->exist('span.element_name:contains("Ed Cox - La fanfare des teuffeurs (Hardcordian)")');
     $this->exist('span.element_name:contains("Acrotek Hardtek G01")');
+    
+    // On cherche des éléments en jouant avec le principe de découpe (' ', ',' '-' ...)
+    $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
+    $form['form[string]'] = 'azyd babylon cox';
+    $this->submit($form);
+    $this->isResponseSuccess();
+    
+    $this->exist('span.element_name:contains("Ed Cox - La fanfare des teuffeurs (Hardcordian)")');
+    $this->exist('span.element_name:contains("Babylon Pression - Des Tasers et des Pauvres")');
+    $this->exist('span.element_name:contains("AZYD AZYLUM Live au Café Provisoire")');
   }
   
   /**