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 Fixing SS3 broken search, use simpler query syntax

Browse Source
This commit is contained in:
Sean Harvey 2012-05-03 14:33:17 +12:00
parent 731874772c
commit 30f017335b
1 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
code/MSSQLDatabase.php
View File

@ -1291,13 +1291,8 @@ class MSSQLDatabase extends SS_Database {
* @return object DataObjectSet of result pages * @return object DataObjectSet of result pages
*/ */
public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $sortBy = "Relevance DESC", $extraFilter = "", $booleanSearch = false, $alternativeFileFilter = "", $invertedMatch = false) { public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $sortBy = "Relevance DESC", $extraFilter = "", $booleanSearch = false, $alternativeFileFilter = "", $invertedMatch = false) {
if(class_exists('PaginatedList')) { if(isset($objects)) $results = new ArrayList($objects);
if(isset($objects)) $results = new ArrayList($objects); else $results = new ArrayList();
else $results = new ArrayList();
} else {
if(isset($objects)) $results = new DataObjectSet($objects);
else $results = new DataObjectSet();
}
if (!$this->fullTextEnabled()) return $results; if (!$this->fullTextEnabled()) return $results;
if (!in_array(substr($sortBy, 0, 9), array('"Relevanc', 'Relevance'))) user_error("Non-relevance sort not supported.", E_USER_ERROR); if (!in_array(substr($sortBy, 0, 9), array('"Relevanc', 'Relevance'))) user_error("Non-relevance sort not supported.", E_USER_ERROR);
@ -1344,12 +1339,7 @@ class MSSQLDatabase extends SS_Database {
} }
} }
if(class_exists('DataList')) { $queries[$tableName] = DataList::create($tableName)->where($where, '')->dataQuery()->query();
$queries[$tableName] = DataList::create($tableName)->where($where, '')->dataQuery()->query();
} else {
$queries[$tableName] = singleton($tableName)->extendedSQL($where);
}
$queries[$tableName]->orderby = null; $queries[$tableName]->orderby = null;
// Join with CONTAINSTABLE, a full text searcher that includes relevance factor // Join with CONTAINSTABLE, a full text searcher that includes relevance factor
@ -1358,7 +1348,11 @@ class MSSQLDatabase extends SS_Database {
if ($tableName != $baseClass) { if ($tableName != $baseClass) {
$queries[$tableName]->from[] = "INNER JOIN \"$baseClass\" ON \"$baseClass\".\"ID\"=\"$tableName\".\"ID\""; $queries[$tableName]->from[] = "INNER JOIN \"$baseClass\" ON \"$baseClass\".\"ID\"=\"$tableName\".\"ID\"";
} }
$queries[$tableName]->select = array("\"$tableName\".\"ID\"", "'$tableName' AS Source", "\"Rank\" AS \"Relevance\"");
$queries[$tableName]->select(array());
$queries[$tableName]->select(array("\"$tableName\".\"ID\""));
$queries[$tableName]->selectField("'$tableName'", 'Source');
$queries[$tableName]->selectField('Rank', 'Relevance');
if ($extraFilter) { if ($extraFilter) {
$queries[$tableName]->where[] = $extraFilter; $queries[$tableName]->where[] = $extraFilter;
} }
@ -1745,13 +1739,13 @@ class MSSQLQuery extends SS_Query {
public function __destruct() { public function __destruct() {
if(is_resource($this->handle)) { if(is_resource($this->handle)) {
if($this->mssql) { if($this->mssql) {
mssql_free_result($this->handle); mssql_free_result($this->handle);
} else { } else {
sqlsrv_free_stmt($this->handle); sqlsrv_free_stmt($this->handle);
}
} }
} }
}
public function seek($row) { public function seek($row) {
if(!is_resource($this->handle)) return false; if(!is_resource($this->handle)) return false;
@ -1765,6 +1759,7 @@ class MSSQLQuery extends SS_Query {
public function numRecords() { public function numRecords() {
if(!is_resource($this->handle)) return false; if(!is_resource($this->handle)) return false;
if($this->mssql) { if($this->mssql) {
return mssql_num_rows($this->handle); return mssql_num_rows($this->handle);
} else { } else {
@ -1780,40 +1775,13 @@ class MSSQLQuery extends SS_Query {
public function nextRecord() { public function nextRecord() {
if(!is_resource($this->handle)) return false; if(!is_resource($this->handle)) return false;
// Coalesce rather than replace common fields.
$output = array();
if($this->mssql) { if($this->mssql) {
if($data = mssql_fetch_row($this->handle)) { if($data = mssql_fetch_assoc($this->handle)) {
foreach($data as $columnIdx => $value) { return $data;
$columnName = mssql_field_name($this->handle, $columnIdx);
// There are many places in the framework that expect the ID to be a string, not a double
// Do not set this to an integer, or it will cause failures in many tests that expect a string
if($columnName == 'ID') $value = (string) $value;
// $value || !$ouput[$columnName] means that the *last* occurring value is shown
// !$ouput[$columnName] means that the *first* occurring value is shown
if(isset($value) || !isset($output[$columnName])) {
$output[$columnName] = $value;
}
}
return $output;
} }
} else { } else {
if($data = sqlsrv_fetch_array($this->handle, SQLSRV_FETCH_NUMERIC)) { if($data = sqlsrv_fetch_array($this->handle, SQLSRV_FETCH_ASSOC)) {
$fields = sqlsrv_field_metadata($this->handle); return $data;
foreach($fields as $columnIdx => $field) {
$value = $data[$columnIdx];
if($value instanceof DateTime) $value = $value->format('Y-m-d H:i:s');
// $value || !$ouput[$columnName] means that the *last* occurring value is shown
// !$ouput[$columnName] means that the *first* occurring value is shown
if(isset($value) || !isset($output[$field['Name']])) {
$output[$field['Name']] = $value;
}
}
return $output;
} else { } else {
// Free the handle if there are no more results - sqlsrv crashes if there are too many handles // Free the handle if there are no more results - sqlsrv crashes if there are too many handles
sqlsrv_free_stmt($this->handle); sqlsrv_free_stmt($this->handle);