Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Start another attack on raw sql queries

Browse source
This commit is contained in:
Sam Reed 2011-01-24 13:59:22 +00:00
parent 61db3d8cab
commit 668323434d
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
includes/search/SearchMySQL.php
View file

@ -196,7 +196,7 @@ class SearchMySQL extends SearchEngine {
if( $this->showRedirects ) {
return '';
} else {
return 'AND page_is_redirect=0';
return 'page_is_redirect=0';
}
}
@ -212,7 +212,7 @@ class SearchMySQL extends SearchEngine {
} else {
$namespaces = $this->db->makeList( $this->namespaces );
}
return 'AND page_namespace IN (' . $namespaces . ')';
return 'page_namespace IN (' . $namespaces . ')';
}
/**
@ -240,8 +240,8 @@ class SearchMySQL extends SearchEngine {
*/
function getQuery( $filteredTerm, $fulltext ) {
return $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
$this->queryRedirect() . ' ' .
$this->queryNamespaces() . ' ' .
'AND ' . $this->queryRedirect() . ' ' .
'AND ' . $this->queryNamespaces() . ' ' .
$this->queryRanking( $filteredTerm, $fulltext ) . ' ' .
$this->queryLimit();
}
@ -276,13 +276,15 @@ class SearchMySQL extends SearchEngine {
function getCountQuery( $filteredTerm, $fulltext ) {
$match = $this->parseQuery( $filteredTerm, $fulltext );
$page = $this->db->tableName( 'page' );
$searchindex = $this->db->tableName( 'searchindex' );
return "SELECT COUNT(*) AS c " .
"FROM $page,$searchindex " .
'WHERE page_id=si_page AND ' . $match .
$this->queryRedirect() . ' ' .
$this->queryNamespaces();
return $this->db->selectSQLText( array( 'page', 'searchindex' ),
'COUNT(*) AS c',
array(
'page_id=si_page',
$match,
$this->queryRedirect(),
$this->queryNamespaces()
) );
}
/**