dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Detect when callers catch DB errors and fail to rollback"
[lhc/web/wiklou.git]
/
includes
/
search
/
SearchMssql.php
diff --git
a/includes/search/SearchMssql.php
b/includes/search/SearchMssql.php
index
0d1663f
..
5e8fb04
100644
(file)
--- a/
includes/search/SearchMssql.php
+++ b/
includes/search/SearchMssql.php
@@
-34,10
+34,7
@@
class SearchMssql extends SearchDatabase {
* @access public
*/
function searchText( $term ) {
* @access public
*/
function searchText( $term ) {
- $resultSet = $this->db->resultObject(
- $this->db->query( $this->getQuery( $this->filter( $term ), true ) )
- );
-
+ $resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), true ) );
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
@@
-49,10
+46,7
@@
class SearchMssql extends SearchDatabase {
* @access public
*/
function searchTitle( $term ) {
* @access public
*/
function searchTitle( $term ) {
- $resultSet = $this->db->resultObject(
- $this->db->query( $this->getQuery( $this->filter( $term ), false ) )
- );
-
+ $resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), false ) );
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
@@
-85,6
+79,8
@@
class SearchMssql extends SearchDatabase {
* Does not do anything for generic search engine
* subclasses may define this though
*
* Does not do anything for generic search engine
* subclasses may define this though
*
+ * @param string $filteredTerm
+ * @param bool $fulltext
* @return string
*/
function queryRanking( $filteredTerm, $fulltext ) {
* @return string
*/
function queryRanking( $filteredTerm, $fulltext ) {
@@
-134,16
+130,18
@@
class SearchMssql extends SearchDatabase {
}
/** @todo document
}
/** @todo document
+ * @param string $filteredText
+ * @param bool $fulltext
* @return string
*/
function parseQuery( $filteredText, $fulltext ) {
global $wgContLang;
$lc = $this->legalSearchChars();
* @return string
*/
function parseQuery( $filteredText, $fulltext ) {
global $wgContLang;
$lc = $this->legalSearchChars();
- $this->searchTerms =
array()
;
+ $this->searchTerms =
[]
;
# @todo FIXME: This doesn't handle parenthetical expressions.
# @todo FIXME: This doesn't handle parenthetical expressions.
- $m =
array()
;
- $q =
array()
;
+ $m =
[]
;
+ $q =
[]
;
if ( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
$filteredText, $m, PREG_SET_ORDER ) ) {
if ( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
$filteredText, $m, PREG_SET_ORDER ) ) {
@@
-162,7
+160,7
@@
class SearchMssql extends SearchDatabase {
}
}
}
}
- $searchon = $this->db->addQuotes(
join
( ',', $q ) );
+ $searchon = $this->db->addQuotes(
implode
( ',', $q ) );
$field = $this->getIndexField( $fulltext );
return "$field, $searchon";
}
$field = $this->getIndexField( $fulltext );
return "$field, $searchon";
}