Fix log type and name in revdeleted messages: suppressions are stored in the suppress...

[lhc/web/wiklou.git] / includes / SearchOracle.php

diff --git a/includes/SearchOracle.php b/includes/SearchOracle.php
index f8204c1..3cd91fa 100644 (file)
--- a/includes/SearchOracle.php
+++ b/includes/SearchOracle.php
@@ -17,9 +17,14 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
+/**
+ * @file
+ * @ingroup Search
+ */
+
 /**
  * Search engine hook base class for Oracle (ConText).
- * @addtogroup Search
+ * @ingroup Search
  */
 class SearchOracle extends SearchEngine {
        function __construct($db) {
@@ -29,11 +34,13 @@ class SearchOracle extends SearchEngine {
        /**
         * Perform a full text search query and return a result set.
         *
-        * @param string $term - Raw search term
+        * @param $term String: raw search term
         * @return OracleSearchResultSet
-        * @access public
         */
        function searchText( $term ) {
+               if ($term == '')
+                       return new OracleSearchResultSet(false, '');
+               
                $resultSet = $this->db->resultObject($this->db->query($this->getQuery($this->filter($term), true)));
                return new OracleSearchResultSet($resultSet, $this->searchTerms);
        }
@@ -41,11 +48,13 @@ class SearchOracle extends SearchEngine {
        /**
         * Perform a title-only search query and return a result set.
         *
-        * @param string $term - Raw search term
+        * @param $term String: raw search term
         * @return ORacleSearchResultSet
-        * @access public
         */
        function searchTitle($term) {
+               if ($term == '')
+                       return new OracleSearchResultSet(false, '');
+               
                $resultSet = $this->db->resultObject($this->db->query($this->getQuery($this->filter($term), false)));
                return new MySQLSearchResultSet($resultSet, $this->searchTerms);
        }
@@ -53,8 +62,7 @@ class SearchOracle extends SearchEngine {
 
        /**
         * Return a partial WHERE clause to exclude redirects, if so set
-        * @return string
-        * @private
+        * @return String
         */
        function queryRedirect() {
                if ($this->showRedirects) {
@@ -66,23 +74,22 @@ class SearchOracle extends SearchEngine {
 
        /**
         * Return a partial WHERE clause to limit the search to the given namespaces
-        * @return string
-        * @private
+        * @return String
         */
        function queryNamespaces() {
                if( is_null($this->namespaces) )
                        return '';
-               $namespaces = implode(',', $this->namespaces);
-               if ($namespaces == '') {
+               if ( !count( $this->namespaces ) ) {
                        $namespaces = '0';
+               } else {
+                       $namespaces = $this->db->makeList( $this->namespaces );
                }
                return 'AND page_namespace IN (' . $namespaces . ')';
        }
 
        /**
         * Return a LIMIT clause to limit results on the query.
-        * @return string
-        * @private
+        * @return String
         */
        function queryLimit($sql) {
                return $this->db->limitResult($sql, $this->limit, $this->offset);
@@ -91,8 +98,7 @@ class SearchOracle extends SearchEngine {
        /**
         * Does not do anything for generic search engine
         * subclasses may define this though
-        * @return string
-        * @private
+        * @return String
         */
        function queryRanking($filteredTerm, $fulltext) {
                return ' ORDER BY score(1)';
@@ -101,9 +107,8 @@ class SearchOracle extends SearchEngine {
        /**
         * Construct the full SQL query to do the search.
         * The guts shoulds be constructed in queryMain()
-        * @param string $filteredTerm
-        * @param bool $fulltext
-        * @private
+        * @param $filteredTerm String
+        * @param $fulltext Boolean
         */
        function getQuery( $filteredTerm, $fulltext ) {
                return $this->queryLimit($this->queryMain($filteredTerm, $fulltext) . ' ' .
@@ -115,8 +120,8 @@ class SearchOracle extends SearchEngine {
 
        /**
         * Picks which field to index on, depending on what type of query.
-        * @param bool $fulltext
-        * @return string
+        * @param $fulltext Boolean
+        * @return String
         */
        function getIndexField($fulltext) {
                return $fulltext ? 'si_text' : 'si_title';
@@ -125,10 +130,9 @@ class SearchOracle extends SearchEngine {
        /**
         * Get the base part of the search query.
         *
-        * @param string $filteredTerm
-        * @param bool $fulltext
-        * @return string
-        * @private
+        * @param $filteredTerm String
+        * @param $fulltext Boolean
+        * @return String
         */
        function queryMain( $filteredTerm, $fulltext ) {
                $match = $this->parseQuery($filteredTerm, $fulltext);
@@ -139,7 +143,10 @@ class SearchOracle extends SearchEngine {
                        'WHERE page_id=si_page AND ' . $match;
        }
 
-       /** @todo document */
+       /** 
+        * Parse a user input search string, and return an SQL fragment to be used 
+        * as part of a WHERE clause
+        */
        function parseQuery($filteredText, $fulltext) {
                global $wgContLang;
                $lc = SearchEngine::legalSearchChars();
@@ -152,7 +159,17 @@ class SearchOracle extends SearchEngine {
                if (preg_match_all('/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
                          $filteredText, $m, PREG_SET_ORDER)) {
                        foreach($m as $terms) {
-                               $q[] = $terms[1] . $wgContLang->stripForSearch($terms[2]);
+                               
+                               // Search terms in all variant forms, only
+                               // apply on wiki with LanguageConverter
+                               $temp_terms = $wgContLang->autoConvertToAllVariants( $terms[2] );
+                               if( is_array( $temp_terms )) {
+                                       $temp_terms = array_unique( array_values( $temp_terms ));
+                                       foreach( $temp_terms as $t )
+                                               $q[] = $terms[1] . $wgContLang->stripForSearch( $t );
+                               }
+                               else
+                                       $q[] = $terms[1] . $wgContLang->stripForSearch( $terms[2] );
 
                                if (!empty($terms[3])) {
                                        $regexp = preg_quote( $terms[3], '/' );
@@ -165,18 +182,18 @@ class SearchOracle extends SearchEngine {
                        }
                }
 
-               $searchon = $this->db->strencode(join(',', $q));
+               $searchon = $this->db->addQuotes(join(',', $q));
                $field = $this->getIndexField($fulltext);
-               return " CONTAINS($field, '$searchon', 1) > 0 ";
+               return " CONTAINS($field, $searchon, 1) > 0 ";
        }
 
        /**
         * Create or update the search index record for the given page.
         * Title and text should be pre-processed.
         *
-        * @param int $id
-        * @param string $title
-        * @param string $text
+        * @param $id Integer
+        * @param $title String
+        * @param $text String
         */
        function update($id, $title, $text) {
                $dbw = wfGetDB(DB_MASTER);
@@ -210,9 +227,10 @@ class SearchOracle extends SearchEngine {
 }
 
 /**
- * @addtogroup Search
+ * @ingroup Search
  */
 class OracleSearchResultSet extends SearchResultSet {
+
        function __construct($resultSet, $terms) {
                $this->mResultSet = $resultSet;
                $this->mTerms = $terms;
@@ -223,10 +241,16 @@ class OracleSearchResultSet extends SearchResultSet {
        }
 
        function numRows() {
-               return $this->mResultSet->numRows();
+               if ($this->mResultSet === false )
+                       return 0;
+               else
+                       return $this->mResultSet->numRows();
        }
 
        function next() {
+               if ($this->mResultSet === false )
+                       return false;
+
                $row = $this->mResultSet->fetchObject();
                if ($row === false)
                        return false;