* @ingroup Search
*/
class SearchOracle extends SearchEngine {
+
+ private $reservedWords = array ('ABOUT' => 1,
+ 'ACCUM' => 1,
+ 'AND' => 1,
+ 'BT' => 1,
+ 'BTG' => 1,
+ 'BTI' => 1,
+ 'BTP' => 1,
+ 'FUZZY' => 1,
+ 'HASPATH' => 1,
+ 'INPATH' => 1,
+ 'MINUS' => 1,
+ 'NEAR' => 1,
+ 'NOT' => 1,
+ 'NT' => 1,
+ 'NTG' => 1,
+ 'NTI' => 1,
+ 'NTP' => 1,
+ 'OR' => 1,
+ 'PT' => 1,
+ 'RT' => 1,
+ 'SQE' => 1,
+ 'SYN' => 1,
+ 'TR' => 1,
+ 'TRSYN' => 1,
+ 'TT' => 1,
+ 'WITHIN' => 1);
+
function __construct($db) {
$this->db = $db;
}
/**
* Perform a full text search query and return a result set.
*
- * @param string $term - Raw search term
- * @return OracleSearchResultSet
- * @access public
+ * @param $term String: raw search term
+ * @return SqlSearchResultSet
*/
function searchText( $term ) {
+ if ($term == '')
+ return new SqlSearchResultSet(false, '');
+
$resultSet = $this->db->resultObject($this->db->query($this->getQuery($this->filter($term), true)));
- return new OracleSearchResultSet($resultSet, $this->searchTerms);
+ return new SqlSearchResultSet($resultSet, $this->searchTerms);
}
/**
* Perform a title-only search query and return a result set.
*
- * @param string $term - Raw search term
- * @return ORacleSearchResultSet
- * @access public
+ * @param $term String: raw search term
+ * @return SqlSearchResultSet
*/
function searchTitle($term) {
+ if ($term == '')
+ return new SqlSearchResultSet(false, '');
+
$resultSet = $this->db->resultObject($this->db->query($this->getQuery($this->filter($term), false)));
return new MySQLSearchResultSet($resultSet, $this->searchTerms);
}
/**
* Return a partial WHERE clause to exclude redirects, if so set
- * @return string
- * @private
+ * @return String
*/
function queryRedirect() {
if ($this->showRedirects) {
/**
* 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 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);
/**
* 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)';
/**
* 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) . ' ' .
/**
* 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';
/**
* 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);
'WHERE page_id=si_page AND ' . $match;
}
- /**
- * Parse a user input search string, and return an SQL fragment to be used
+ /**
+ * Parse a user input search string, and return an SQL fragment to be used
* as part of a WHERE clause
*/
function parseQuery($filteredText, $fulltext) {
# FIXME: This doesn't handle parenthetical expressions.
$m = array();
- $q = array();
-
+ $searchon = '';
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 ) {
+ $searchon .= ($terms[1] == '-' ? ' ~' : ' & ') . $this->escapeTerm( $t );
+ }
+ }
+ else {
+ $searchon .= ($terms[1] == '-' ? ' ~' : ' & ') . $this->escapeTerm( $terms[2] );
+ }
if (!empty($terms[3])) {
$regexp = preg_quote( $terms[3], '/' );
if ($terms[4])
}
}
- $searchon = $this->db->addQuotes(join(',', $q));
+
+ $searchon = $this->db->addQuotes(ltrim($searchon, ' &'));
$field = $this->getIndexField($fulltext);
return " CONTAINS($field, $searchon, 1) > 0 ";
}
+ private function escapeTerm($t) {
+ global $wgContLang;
+ $t = $wgContLang->normalizeForSearch($t);
+ $t = isset($this->reservedWords[strtoupper($t)]) ? '{'.$t.'}' : $t;
+ $t = preg_replace('/^"(.*)"$/', '($1)', $t);
+ $t = preg_replace('/([-&|])/', '\\\\$1', $t);
+ return $t;
+ }
/**
* 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);
'SearchOracle::updateTitle',
array());
}
-}
-
-/**
- * @ingroup Search
- */
-class OracleSearchResultSet extends SearchResultSet {
- function __construct($resultSet, $terms) {
- $this->mResultSet = $resultSet;
- $this->mTerms = $terms;
- }
- function termMatches() {
- return $this->mTerms;
- }
-
- function numRows() {
- return $this->mResultSet->numRows();
- }
- function next() {
- $row = $this->mResultSet->fetchObject();
- if ($row === false)
- return false;
- return new SearchResult($row);
+ public static function legalSearchChars() {
+ return "\"" . parent::legalSearchChars();
}
}
scripts.mit.edu / autoinstalls / mediawiki.git / blobdiff