tonyair/silverstripe-mssql
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-mssql synced 2024-10-22 06:05:53 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: limit the query results for pagination

Browse Source
This commit is contained in:
Mateusz Uzdowski 2010-09-01 04:06:36 +00:00
parent 2aff1a9196
commit 2b5f25455f
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
code/MSSQLDatabase.php
View File

@ -1228,9 +1228,8 @@ class MSSQLDatabase extends SS_Database {
*/
public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $sortBy = "Relevance DESC", $extraFilter = "", $booleanSearch = false, $alternativeFileFilter = "", $invertedMatch = false) {
$results = new DataObjectSet();
if(!$this->fullTextEnabled()) {
return $results;
}
if(!$this->fullTextEnabled()) return $results;
if (substr($sortBy, 0, 9)!='Relevance') user_error("Non-relevance sort not supported.", E_USER_ERROR);
//Get a list of all the tables and columns we'll be searching on:
$fulltextColumns = DB::query('EXEC sp_help_fulltext_columns');
@ -1266,7 +1265,7 @@ class MSSQLDatabase extends SS_Database {
$queries[$tableName]->orderby = null;
}
// Generate SQL and count totals
// Generate SQL
$querySQLs = array();
foreach($queries as $query) {
$querySQLs[] = $query->sql();
@ -1278,16 +1277,20 @@ class MSSQLDatabase extends SS_Database {
// Perform the search
$result = DB::query($fullQuery);
// Regenerate the DataObjects, apply security
$totalCount = 0;
foreach($result as $row) {
$record = DataObject::get_by_id($row['Source'], $row['ID']);
if($record->canView()) {
$results->push($record);
$totalCount++;
}
}
// Regenerate DataObjectSet
$totalCount = $result->numRecords();
$current = -1;
$results = new DataObjectSet();
foreach ($result as $row) {
$current++;
// Select a subset for paging
if ($current>=$start+$pageLength) break;
if ($current<$start) continue;
$results->push(DataObject::get_by_id($row['Source'], $row['ID']));
}
$results->setPageLimits($start, $pageLength, $totalCount);
return $results;