Amélioration du système de trie des tags.

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -171,40 +171,117 @@ class SearchController extends Controller
     throw new \Exception('XmlHttpRequest only for this action');
   }
   
-  protected function sort_search_tags($tags, $search)
+  /**
+   * Ajoute le tag au début du tableau passé en paramètre si celui-ci
+   * n'est pas a l'intérieur.
+   * 
+   * @param array $array
+   * @param Tag $tag
+   * @return array 
+   */
+  private function sort_addtop_if_isnt_in($array, $tag)
+  {
+    $in = false;
+    for ($x=0;$x<=sizeof($array)-1;$x++)
+    {
+      if ($array[$x]['id'] == $tag['id'])
+      {
+        $in = true;
+        break;
+      }
+    }
+    
+    if (!$in)
+    {
+      array_unshift($array, $tag);
+      return $array;
+    }
+    return $array;
+  }
+  
+  /**
+   * Ajoute le tag a al fin du tableau passé en paramètre si celui-ci
+   * n'est pas a l'intérieur.
+   * 
+   * @param array $array
+   * @param Tag $tag
+   * @return array 
+   */
+  private function sort_addbottom_if_isnt_in($array, $tag)
+  {
+    $in = false;
+    for ($x=0;$x<=sizeof($array)-1;$x++)
+    {
+      if ($array[$x]['id'] == $tag['id'])
+      {
+        $in = true;
+        break;
+      }
+    }
+    
+    if (!$in)
+    {
+      $array[] = $tag;
+      return $array;
+    }
+    return $array;
+  }
+  
+  /**
+   * Organise le trie des tags de manière plus friendly user.
+   *
+   * @param array $tags
+   * @param string $search
+   * @return array 
+   */
+  private function sort_search_tags($tags, $search)
   {
     $canonicalizer = new StrictCanonicalizer();
-    $tag_sorted = $tags;
+    $tag_sorted = array();
     
     foreach ($tags as $i => $tag)
     {
       // Pas plus de trois caractères en plus de la recherche
-      foreach (explode(' ', $search) as $word)
+      $terms = array_merge(array($search), explode(' ', $search));
+      foreach ($terms as $word)
       {
-        if (strlen(str_replace(strtoupper($canonicalizer->canonicalize($word)), '', strtoupper($tag['slug']))) < 4)
+        if (strlen($word) > 1)
         {
-          unset($tag_sorted[$i]);
-          $tag_sorted = array_merge(array($tag), $tag_sorted);
+          if (strlen(str_replace(strtoupper($canonicalizer->canonicalize($word)), '', strtoupper($tag['slug']))) < 4)
+          {
+            $tag_sorted = $this->sort_addtop_if_isnt_in($tag_sorted, $tag);
+          }
         }
       }
       
     }
     
-    $tags = $tag_sorted;
-    
     foreach ($tags as $i => $tag)
     {
       // Chaine de caractère identique
-      foreach (explode(' ', $search) as $word)
+      $terms = array_merge(
+        array($search), 
+        explode(' ', $search), 
+        explode('-', $search),
+        array(str_replace(' ', '-', $search)),
+        array(str_replace('-', ' ', $search))
+      );
+      
+      foreach ($terms as $word)
       {
-        if (strtoupper($canonicalizer->canonicalize($word)) == strtoupper($tag['slug']))
+        if (strlen($word) > 1)
         {
-          unset($tag_sorted[$i]);
-          $tag_sorted = array_merge(array($tag), $tag_sorted);
+          if (strtoupper($canonicalizer->canonicalize($word)) == strtoupper($tag['slug']))
+          {
+            $tag_sorted = $this->sort_addtop_if_isnt_in($tag_sorted, $tag);
+          }
         }
       }
-      
-      
+    }
+    
+    foreach ($tags as $i => $tag)
+    {
+      $tag_sorted = $this->sort_addbottom_if_isnt_in($tag_sorted, $tag);
     }
     
     return $tag_sorted;
@@ -242,17 +319,20 @@ class SearchController extends Controller
         $params = array();
         foreach ($words as $i => $word)
         {
-          $word = $canonicalizer->canonicalize($word);
-          if ($where == '')
-          {
-            $where .= 'WHERE UPPER(t.slug) LIKE :str'.$i;
-          }
-          else
+          if (strlen($word) > 1)
           {
-            $where .= ' OR UPPER(t.slug) LIKE :str'.$i;
-          }
+            $word = $canonicalizer->canonicalize($word);
+            if ($where == '')
+            {
+              $where .= 'WHERE UPPER(t.slug) LIKE :str'.$i;
+            }
+            else
+            {
+              $where .= ' OR UPPER(t.slug) LIKE :str'.$i;
+            }
 
-          $params['str'.$i] = '%'.strtoupper($word).'%';
+            $params['str'.$i] = '%'.strtoupper($word).'%';
+          }
         }
 
         $tags = $this->getDoctrine()->getEntityManager()->createQuery("

src/Muzich/CoreBundle/Util/StrictCanonicalizer.php

@@ -24,7 +24,7 @@ class StrictCanonicalizer implements CanonicalizerInterface
             'ô', 'ö', 'ò', 'ó', 'õ', 'ø', 
             'ù', 'û', 'ü', 'ú', 
             'é', 'è', 'ê', 'ë', 
-            'ç', 'ÿ', 'ñ', 
+            'ç', 'ÿ', 'ñ', '\'', '"'
         ),
         array(
             'a', 'a', 'a', 'a', 'a', 'a', 
@@ -32,7 +32,7 @@ class StrictCanonicalizer implements CanonicalizerInterface
             'o', 'o', 'o', 'o', 'o', 'o', 
             'u', 'u', 'u', 'u', 
             'e', 'e', 'e', 'e', 
-            'c', 'y', 'n', 
+            'c', 'y', 'n', '', ''
         ),
         $texte
     );

web/bundles/muzichcore/js/muzich.js

@@ -647,7 +647,7 @@ $(document).ready(function(){
   function autocomplete_tag(input, form_name)
   {
     // Il doit y avoir au moin un caractère
-    if (input.val().length > 0) 
+    if ((input.val().length > 0) && (input.val() != string_tag_prompt_input_help)) 
     {
 
       // on met en variable l'input
@@ -718,13 +718,10 @@ $(document).ready(function(){
                 var t_string = tag_name
                 // On construit un li
                 
-                string_exploded = explode(' ', $.trim(input.val()));
-                for (n in string_exploded)
-                {
-                  r_string = string_exploded[n];
-                  var re = new RegExp(r_string, "i");
-                  t_string = t_string.replace(re,"<strong>" + r_string + "</strong>");
-                }
+                r_string = $.trim(input.val());
+                var re = new RegExp(r_string, "i");
+                t_string = t_string.replace(re,"<strong>" + r_string + "</strong>");
+                
                                 
                 li_tag = 
                   $('<li>').append(