Doctrine

Timestamp:

12/17/08 23:04:21 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixed issue with accented characters with Searchable behavior (closes #1745)

Location:

branches

Files:

• 1.0/lib/Doctrine/Search/Analyzer/Standard.php (modified) (1 diff)
• 1.0/tests/Ticket/1745TestCase.php (added)
• 1.1/lib/Doctrine/Search/Analyzer/Interface.php (modified) (1 diff)
• 1.1/lib/Doctrine/Search/Analyzer/Standard.php (modified) (1 diff)
• 1.1/tests/Ticket/1745TestCase.php (added)

branches/1.0/lib/Doctrine/Search/Analyzer/Standard.php

@@ -274 +274 @@
     {
         $text = preg_replace('/[\'`�"]/', '', $text);
+        $text = Doctrine_Inflector::unaccent($text);
         $text = preg_replace('/[^A-Za-z0-9]/', ' ', $text);
         $text = str_replace('  ', ' ', $text);

branches/1.1/lib/Doctrine/Search/Analyzer/Interface.php

@@ -33 +33 @@
 interface Doctrine_Search_Analyzer_Interface
 {
-    public function analyze($text, $encoding='ISO8859-15');
+    public function analyze($text);
 }

branches/1.1/lib/Doctrine/Search/Analyzer/Standard.php

@@ -271 +271 @@
                             );
 
-    /**
-    * Translit $text from $encoding to regular ASCII
-    * @param string $text
-    * @param string $encoding
-    * @return string translitterated text
-    */
-    private function translit($text,$encoding)
+    public function analyze($text)
     {
-        $old_locale = setlocale(LC_ALL, '0');
-
-        // iconv translit does work only if your locale is an unicode
-        // locale, so let's move to an unicode locale :-)
-        setlocale(LC_ALL, 'en_US.UTF8');
-
-        $r = '';
-        $s1 = iconv($encoding, 'ASCII//TRANSLIT', $text);
-        for ($i = 0; $i < strlen($s1); $i++)
-        {
-            $ch1 = $s1[$i];
-            $ch2 = mb_substr($text, $i, 1);
-
-            $r .= $ch1=='?'?$ch2:$ch1;
-        }
-
-        setlocale(LC_ALL, $old_locale);
-        return $r;
-    }
-
-    public function analyze($text, $encoding='ISO-8859-15')
-    {
-        $text = $this->translit($text,$encoding); 
-
         $text = preg_replace('/[\'`�"]/', '', $text);
+        $text = Doctrine_Inflector::unaccent($text);
         $text = preg_replace('/[^A-Za-z0-9]/', ' ', $text);
         $text = str_replace('  ', ' ', $text);