Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...
[lhc/web/wiklou.git] / includes / SearchEngine.php
index 7642351..5e59888 100644 (file)
@@ -12,9 +12,9 @@ class SearchEngine {
        var $limit = 10;
        var $offset = 0;
        var $searchTerms = array();
-       var $namespaces = array( 0 );
+       var $namespaces = array( NS_MAIN );
        var $showRedirects = false;
-       
+
        /**
         * Perform a full text search query and return a result set.
         * If title searches are not supported or disabled, return null.
@@ -40,7 +40,7 @@ class SearchEngine {
        function searchTitle( $term ) {
                return null;
        }
-       
+
        /**
         * If an exact title match can be find, or a very slightly close match,
         * return the title. If no match, returns NULL.
@@ -48,44 +48,74 @@ class SearchEngine {
         * @static
         * @param string $term
         * @return Title
-        * @access private
+        * @private
         */
-       function getNearMatch( $term ) {
-               # Exact match? No need to look further.
-               $title = Title::newFromText( $term );
-               if (is_null($title))
-                       return NULL;
+       function getNearMatch( $searchterm ) {
+               global $wgContLang;
 
-               if ( $title->getNamespace() == NS_SPECIAL || $title->exists() ) {
-                       return $title;
-               }
+               $allSearchTerms = array($searchterm);
 
-               # Now try all lower case (i.e. first letter capitalized)
-               #
-               $title = Title::newFromText( strtolower( $term ) );
-               if ( $title->exists() ) {
-                       return $title;
+               if($wgContLang->hasVariants()){
+                       $allSearchTerms = array_merge($allSearchTerms,$wgContLang->convertLinkToAllVariants($searchterm));
                }
 
-               # Now try capitalized string
-               #
-               $title = Title::newFromText( ucwords( strtolower( $term ) ) );
-               if ( $title->exists() ) {
-                       return $title;
-               }
+               foreach($allSearchTerms as $term){
 
-               # Now try all upper case
-               #
-               $title = Title::newFromText( strtoupper( $term ) );
-               if ( $title->exists() ) {
-                       return $title;
+                       # Exact match? No need to look further.
+                       $title = Title::newFromText( $term );
+                       if (is_null($title))
+                               return NULL;
+
+                       if ( $title->getNamespace() == NS_SPECIAL || $title->exists() ) {
+                               return $title;
+                       }
+
+                       # Now try all lower case (i.e. first letter capitalized)
+                       #
+                       $title = Title::newFromText( $wgContLang->lc( $term ) );
+                       if ( $title->exists() ) {
+                               return $title;
+                       }
+
+                       # Now try capitalized string
+                       #
+                       $title = Title::newFromText( $wgContLang->ucwords( $term ) );
+                       if ( $title->exists() ) {
+                               return $title;
+                       }
+
+                       # Now try all upper case
+                       #
+                       $title = Title::newFromText( $wgContLang->uc( $term ) );
+                       if ( $title->exists() ) {
+                               return $title;
+                       }
+
+                       # Now try Word-Caps-Breaking-At-Word-Breaks, for hyphenated names etc
+                       $title = Title::newFromText( $wgContLang->ucwordbreaks($term) );
+                       if ( $title->exists() ) {
+                               return $title;
+                       }
+
+                       global $wgCapitalLinks, $wgContLang;
+                       if( !$wgCapitalLinks ) {
+                               // Catch differs-by-first-letter-case-only
+                               $title = Title::newFromText( $wgContLang->ucfirst( $term ) );
+                               if ( $title->exists() ) {
+                                       return $title;
+                               }
+                               $title = Title::newFromText( $wgContLang->lcfirst( $term ) );
+                               if ( $title->exists() ) {
+                                       return $title;
+                               }
+                       }
                }
 
-               $title = Title::newFromText( $term );
+               $title = Title::newFromText( $searchterm );
 
                # Entering an IP address goes to the contributions page
                if ( ( $title->getNamespace() == NS_USER && User::isIP($title->getText() ) )
-                       || User::isIP( trim( $term ) ) ) {
+                       || User::isIP( trim( $searchterm ) ) ) {
                        return Title::makeTitle( NS_SPECIAL, "Contributions/" . $title->getDbkey() );
                }
 
@@ -94,15 +124,15 @@ class SearchEngine {
                if ( $title->getNamespace() == NS_USER ) {
                        return $title;
                }
-               
+
                # Quoted term? Try without the quotes...
-               if( preg_match( '/^"([^"]+)"$/', $term, $matches ) ) {
+               if( preg_match( '/^"([^"]+)"$/', $searchterm, $matches ) ) {
                        return SearchEngine::getNearMatch( $matches[1] );
                }
-               
+
                return NULL;
        }
-       
+
        function legalSearchChars() {
                return "A-Za-z_'0-9\\x80-\\xFF\\-";
        }
@@ -116,10 +146,10 @@ class SearchEngine {
         * @access public
         */
        function setLimitOffset( $limit, $offset = 0 ) {
-               $this->limit = IntVal( $limit );
-               $this->offset = IntVal( $offset );
+               $this->limit = intval( $limit );
+               $this->offset = intval( $offset );
        }
-       
+
        /**
         * Set which namespaces the search should include.
         * Give an array of namespace index numbers.
@@ -130,7 +160,7 @@ class SearchEngine {
        function setNamespaces( $namespaces ) {
                $this->namespaces = $namespaces;
        }
-       
+
        /**
         * Make a list of searchable namespaces and their canonical names.
         * @return array
@@ -146,7 +176,7 @@ class SearchEngine {
                }
                return $arr;
        }
-       
+
        /**
         * Return a 'cleaned up' search string
         *
@@ -162,23 +192,16 @@ class SearchEngine {
         * active database backend, and return a configured instance.
         *
         * @return SearchEngine
-        * @access private
+        * @private
         */
        function create() {
-               global $wgDBtype, $wgDBmysql4, $wgSearchType;
+               global $wgDBtype, $wgSearchType;
                if( $wgSearchType ) {
                        $class = $wgSearchType;
                } elseif( $wgDBtype == 'mysql' ) {
-                       if( $wgDBmysql4 ) {
-                               $class = 'SearchMySQL4';
-                               require_once( 'SearchMySQL4.php' );
-                       } else {
-                               $class = 'SearchMysql3';
-                               require_once( 'SearchMySQL3.php' );
-                       }
-               } else if ( $wgDBtype == 'PostgreSQL' ) {
-                       $class = 'SearchTsearch2';
-                       require_once( 'SearchTsearch2.php' );
+                       $class = 'SearchMySQL4';
+               } else if ( $wgDBtype == 'postgres' ) {
+                       $class = 'SearchPostgres';
                } else {
                        $class = 'SearchEngineDummy';
                }
@@ -186,7 +209,7 @@ class SearchEngine {
                $search->setLimitOffset(0,0);
                return $search;
        }
-       
+
        /**
         * Create or update the search index record for the given page.
         * Title and text should be pre-processed.
@@ -226,11 +249,11 @@ class SearchResultSet {
        function termMatches() {
                return array();
        }
-       
+
        function numRows() {
                return 0;
        }
-       
+
        /**
         * Return true if results are included in this result set.
         * @return bool
@@ -239,7 +262,7 @@ class SearchResultSet {
        function hasResults() {
                return false;
        }
-       
+
        /**
         * Some search modes return a total hit count for the query
         * in the entire article database. This may include pages
@@ -254,7 +277,7 @@ class SearchResultSet {
        function getTotalHits() {
                return null;
        }
-       
+
        /**
         * Some search modes return a suggested alternate term if there are
         * no exact hits. Returns true if there is one on this set.
@@ -265,7 +288,7 @@ class SearchResultSet {
        function hasSuggestion() {
                return false;
        }
-       
+
        /**
         * Some search modes return a suggested alternate term if there are
         * no exact hits. Check hasSuggestion() first.
@@ -276,7 +299,7 @@ class SearchResultSet {
        function getSuggestion() {
                return '';
        }
-       
+
        /**
         * Fetches next search result, or false.
         * @return SearchResult
@@ -293,7 +316,7 @@ class SearchResult {
        function SearchResult( $row ) {
                $this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
        }
-       
+
        /**
         * @return Title
         * @access public
@@ -301,7 +324,7 @@ class SearchResult {
        function getTitle() {
                return $this->mTitle;
        }
-       
+
        /**
         * @return double or null if not supported
         */
@@ -317,5 +340,11 @@ class SearchEngineDummy {
        function search( $term ) {
                return null;
        }
+       function setLimitOffset($l, $o) {}
+       function legalSearchChars() {}
+       function update() {}
+       function setnamespaces() {}
+       function searchtitle() {}
+       function searchtext() {}
 }
-
+?>