follow-up r60743.

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index 0ee0484..6aa9c9b 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1695,9 +1695,9 @@ class Language {
         * @param $string String
         * @return String
         */
-       function stripForSearch( $string ) {
-               global $wgDBtype, $wgSearchType;
-               if ( $wgDBtype != 'mysql' || $wgSearchType == 'LuceneSearch' ) {
+       function stripForSearch( $string, $doStrip = true ) {
+               global $wgDBtype;
+               if ( $wgDBtype != 'mysql' || $doStrip == false ) {
                        return $string;
                }
 
@@ -1767,6 +1767,22 @@ class Language {
                return $this->minSearchLength;
        }
 
+       /**
+        * convert double-width roman characters to single-width.
+        * range: ff00-ff5f ~= 0020-007f
+        */
+       protected static function convertDoubleWidth( $string ) {
+               $string = preg_replace( '/\xef\xbc([\x80-\xbf])/e', 'chr((ord("$1") & 0x3f) + 0x20)', $string );
+               $string = preg_replace( '/\xef\xbd([\x80-\x99])/e', 'chr((ord("$1") & 0x3f) + 0x60)', $string );
+               return $string;
+       }
+
+       protected static function wordSegmentation( $string, $pattern ) {
+               $string = preg_replace( $pattern, " $1 ", $string );
+               $string = preg_replace( '/ +/', ' ', $string );
+               return $string;
+       }
+
        function convertForSearchResult( $termsArray ) {
                # some languages, e.g. Chinese, need to do a conversion
                # in order for search results to be displayed correctly