Evolution #166: La recherche

app/Resources/translations/userui.fr.yml

@@ -141,4 +141,7 @@ comment:
       no:                Non
       
 search_tag:
-  title:                 Recherche de tag correspondant à \"%string_search%\" ...
+  title:                 Recherche de tag correspondant à \"%string_search%\" ...
+  
+global_search:
+  no_results:            Il n'y a aucun résultat a votre recherche.

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -184,6 +184,39 @@ class SearchController extends Controller
     
     throw new \Exception('XmlHttpRequest only for this action');
   }
+  
+  /**
+   * Action permettant d'afficher plus de résultats (éléments) dans
+   * une global search.
+   * 
+   * @param Request $request
+   * @param int $last_id
+   * @param string $string
+   * @return Response 
+   */
+  public function globalSearchMoreAction(Request $request, $last_id, $string)
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    $search = $this->createSearchObject(array(
+      'count'    => $this->container->getParameter('search_ajax_more'),
+      'id_limit' => $last_id,
+      'string'   => $string
+    ));
+    
+    $elements = $search->getElements($this->getDoctrine(), $this->getUserId());
+      
+    return $this->searchElementsMore($elements, false,
+      $this->trans(
+        'elements.ajax.more.noelements', 
+        array(), 
+        'elements'
+      )
+    );
+  }
     
   /**
    * Procédure (ajax) de recherche de tags. Essentielement utilisé dans 
@@ -311,14 +344,16 @@ class SearchController extends Controller
         $results = $searcher->getResults(
           $this->getDoctrine(), 
           $this->getUserId(),
+          $this->container->getParameter('search_default_count'),
           $this->container->getParameter('search_global_elements_word_min_length')
         );
       }
     }
     
     return array(
-      'form' => $form->createView(),
-      'results'     => $results
+      'form'        => $form->createView(),
+      'results'     => $results,
+      'display_more_button' => (count($results['elements']))? (count($results['elements']) >= $this->container->getParameter('search_default_count'))? true : false : false
     );
   }
   

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -62,7 +62,11 @@ class ElementRepository extends EntityRepository
       return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), null, null, $searcher->getIdsDisplay());
     }
     
+    // Booléen nous permettant de savoir si un where a déjà été écrit
+    $is_where = false;
+    
     // Si c'est une recherche string, les autres paramètres ne sont pas nécéssaire
+    $where_string = '';
     if (($string = $searcher->getString()))
     {
       // On prépare notre liste de mots
@@ -79,8 +83,8 @@ class ElementRepository extends EntityRepository
       ));
       
       // On récupère les ids des elements correspondants
-      $where_string = "WHERE 1 = 2";
-      $params_string = array();
+      //$where_string = "WHERE 1 = 2";
+      //$params_string = array();
       $word_min_length = 0;
       if (isset($params['word_min_length']))
       {
@@ -90,44 +94,53 @@ class ElementRepository extends EntityRepository
       {
         if (strlen($word) >= $word_min_length)
         {
-          if ($where_string === "WHERE 1 = 2")
+          $where_string = ($is_where) ? ' AND (' : ' WHERE (';
+          $is_where = true;
+          if ($where_string === ' AND (' || $where_string === ' WHERE (')
           {
-            $where_string = " WHERE UPPER(e.name) LIKE :str".$i;
+            $where_string .= "UPPER(e_.name) LIKE :str".$i;
           }
           else
           {
-            $where_string .= " OR UPPER(e.name) LIKE :str".$i;
+            $where_string .= " OR UPPER(e_.name) LIKE :str".$i;
           }
-          $params_string['str'.$i] = '%'.strtoupper($word).'%';
+          //$params_string['str'.$i] = '%'.strtoupper($word).'%';
+          $params_ids['str'.$i] = '%'.strtoupper($word).'%';
         }
       }
+      $where_string .= ')';
       
-      $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")
-      ;
+//      $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")
+//      ;
     }
     
     
-    // Booléen nous permettant de savoir si un where a déjà été écrit
-    $is_where = false;
-    
     // Construction des conditions pour la selection d'ids
     $where_tags = '';
     $join_tags  = '';
@@ -312,8 +325,9 @@ class ElementRepository extends EntityRepository
         $where_user
         $where_group
         $where_favorite
-        $where_id_limit
         $where_tag_strict
+        $where_string
+        $where_id_limit
         GROUP BY e_.id
         $order_by")
      ->setParameters($params_ids)
@@ -353,7 +367,7 @@ class ElementRepository extends EntityRepository
   }
   
   protected function getSelectElementForSearchQuery($params_select, $user_id, $ids, $id_limit = null, $count_limit = null, $ids_display = null)
-  {    
+  {
     $where = "";
     if ($id_limit)
     {

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -16,6 +16,14 @@ search_elements_show_more:
   pattern:  /search-elements/show/{type}/{object_id}/{id_limit}/{invertcolors}
   defaults: { _controller: MuzichCoreBundle:Search:searchElementsShow }
    
+global_search_elements_empty:
+  pattern:  /global-search-elements/
+  defaults: { _controller: MuzichCoreBundle:Search:globalSearchMore }
+  
+global_search_elements:
+  pattern:  /global-search-elements/{last_id}/{string}
+  defaults: { _controller: MuzichCoreBundle:Search:globalSearchMore }
+   
 follow:
   pattern:  /follow/{type}/{id}/{token}
   defaults: { _controller: MuzichCoreBundle:Core:follow }

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

@@ -6,7 +6,9 @@
 
   {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': null} %}
   
-  {% include "MuzichCoreBundle:GlobalSearch:form.html.twig" with {'form': form } %}
+  <div id="results_search_form">
+    {% include "MuzichCoreBundle:GlobalSearch:form.html.twig" with {'form': form } %}
+  </div>
   
   {% if results.users|length or results.groups|length or results.elements|length %}
   
@@ -45,10 +47,18 @@
         'elements'          : results.elements
       }%}
       
-    {% endif %}
+      {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+        'display_more_button' : display_more_button,
+        'elements_length'     : results.elements|length,
+        'more_path'           : 'global_search_elements_empty'
+      }%}
       
-  {% else %}
+    {% endif %}
       
+  {% elseif app.request.getMethod == 'POST' %}
+      <p>
+        {{ 'global_search.no_results'|trans({}, 'userui') }}
+      </p>
   {% endif %}
 
 {% endblock %}

src/Muzich/CoreBundle/Resources/views/SearchElement/more_button.html.twig

@@ -0,0 +1,11 @@
+<div class="elements_loader_div">
+  <img class="elements_more_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+</div>
+
+{% if display_more_button and elements_length %} 
+   <span class="elements_more">
+     <a href="{{ path(more_path) }}" class="elements_more button">
+       {{ 'more'|trans({}, 'userui') }}
+     </a>
+   </span>
+{% endif %}

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -59,6 +59,7 @@
     url_add_tag = "{{ path('ajax_add_tag') }}";
     url_element_new_count = "{{ path('element_new_count') }}";
     url_element_new_get = "{{ path('element_new_get') }}";
+    url_global_search = "{{ path('global_search') }}";
     
     url_img_ajax_loader = "{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}";
   </script>

src/Muzich/CoreBundle/Searcher/GlobalSearcher.php

@@ -51,7 +51,7 @@ class GlobalSearcher extends Searcher implements SearcherInterface
    * @param Registry $doctrine
    * @return array
    */
-  public function getResults(Registry $doctrine, $user_id, $min_word_length = null)
+  public function getResults(Registry $doctrine, $user_id, $search_elements_count, $min_word_length = null)
   {
     // On remplace le caratcère '%' au cas ou un malin l'insére.
     $string = str_replace('%', '#', $this->string);
@@ -61,7 +61,10 @@ class GlobalSearcher extends Searcher implements SearcherInterface
     
     // puis on fait recherche sur elements
     $es = new ElementSearcher();
-    $es->init(array('string' => $string));
+    $es->init(array(
+      'string' => $string,
+      'count'  => $search_elements_count
+    ));
     $results = $ugs->getResults($doctrine);
     $results['elements'] = $es->getElements(
       $doctrine, 

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -28,6 +28,9 @@ class HomeController extends Controller
     $search_form = $this->getSearchForm($search_object);
     $add_form = $this->getAddForm();
     
+    $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+    $count_elements = count($elements);
+    
     return array(
       'search_tags_id'   => $search_object->getTags(),
       'ids_display'      => $search_object->getIdsDisplay(),
@@ -37,8 +40,8 @@ class HomeController extends Controller
       'search_form'      => $search_form->createView(),
       'search_form_name' => 'search',
       'network_public'   => $search_object->isNetworkPublic(),
-      'elements'         => $search_object->getElements($this->getDoctrine(), $this->getUserId()),
-      'more_count'       => ($count)?$count+$this->container->getParameter('search_default_count'):$this->container->getParameter('search_default_count')*2
+      'elements'         => $elements,
+      'display_more_button' => ($count_elements >= $this->container->getParameter('search_default_count'))?true:false
     );
   }
 }

src/Muzich/HomeBundle/Resources/views/Home/index.html.twig

@@ -58,20 +58,14 @@
     <img class="elements_new_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
   </div>
 
-  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {'noelements_filter' : true }%}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
+    'noelements_filter' : true 
+  }%}
     
-  <div class="elements_loader_div">
-    <img class="elements_more_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
-  </div>
-  
-  {% if more_count is defined %} 
-  {% if elements|length %}
-     <span class="elements_more">
-       <a href="{{ path('search_elements') }}" class="elements_more button">
-         {{ 'more'|trans({}, 'userui') }}
-       </a>
-     </span>
-  {% endif %}
-  {% endif %}
+  {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+    'display_more_button' : display_more_button,
+    'elements_length'     : elements|length,
+    'more_path'           : 'search_elements'
+  }%}
   
 {% endblock %}

web/bundles/muzichcore/js/muzich.js

@@ -461,7 +461,15 @@ $(document).ready(function(){
        invertcolor = 1;
      }
      $('img.elements_more_loader').show();
-     $.getJSON(link.attr('href')+'/'+id_last+'/'+invertcolor, function(response) {
+     
+     var url = link.attr('href')+'/'+id_last+'/'+invertcolor;
+     // Cas exeptionel si on se trouve sur la global_search
+     if ($('div#results_search_form').length)
+     {
+       url = link.attr('href')+id_last+'/'+$('div#results_search_form form input[type="text"]').val();
+     }
+     
+     $.getJSON(url, function(response) {
        if (response.status == 'mustbeconnected')
         {
           $(location).attr('href', url_index);
@@ -471,6 +479,7 @@ $(document).ready(function(){
        {
          $('ul.elements').append(response.html);
          $('img.elements_more_loader').hide();
+         recolorize_element_list();
        }
        
        if (response.end || response.count < 1)