tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX fixing the build, making the code happier

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78497 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Tom Rix 2009-06-05 04:37:45 +00:00
parent d064eeb36b
commit bfaa938897
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/model/MySQLDatabase.php
View File

@ -720,12 +720,10 @@ class MySQLDatabase extends Database {
* *
* @param string $keywords Keywords as a string. * @param string $keywords Keywords as a string.
*/ */
public function searchEngine($keywords, $pageLength = null, $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(!$pageLength) $pageLength = $this->pageLength;
$fileFilter = ''; $fileFilter = '';
$keywords = Convert::raw2sql($keywords); $keywords = Convert::raw2sql($keywords);
$htmlEntityKeywords = htmlentities($keywords); $htmlEntityKeywords = htmlentities($keywords);
$classesToSearch = explode(',', SearchForm::$classesToSearch);
$extraFilters = array('SiteTree' => '', 'File' => ''); $extraFilters = array('SiteTree' => '', 'File' => '');
@ -741,7 +739,6 @@ class MySQLDatabase extends Database {
// Always ensure that only pages with ShowInSearch = 1 can be searched // Always ensure that only pages with ShowInSearch = 1 can be searched
$extraFilters['SiteTree'] .= " AND ShowInSearch <> 0"; $extraFilters['SiteTree'] .= " AND ShowInSearch <> 0";
$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
$limit = $start . ", " . (int) $pageLength; $limit = $start . ", " . (int) $pageLength;
$notMatch = $invertedMatch ? "NOT " : ""; $notMatch = $invertedMatch ? "NOT " : "";

13
search/SearchForm.php
View File

@ -23,7 +23,9 @@ class SearchForm extends Form {
/** /**
* Classes to search * Classes to search
*/ */
static public $classesToSearch = "SiteTree,File"; protected $classesToSearch = array(
"SiteTree", "File"
);
/** /**
* *
@ -111,10 +113,13 @@ class SearchForm extends Form {
$keywords = $this->addStarsToKeywords($keywords); $keywords = $this->addStarsToKeywords($keywords);
if(!$pageLength) $pageLength = $this->pageLength;
$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
if(strpos($keywords, '"') !== false || strpos($keywords, '+') !== false || strpos($keywords, '-') !== false || strpos($keywords, '*') !== false) { if(strpos($keywords, '"') !== false || strpos($keywords, '+') !== false || strpos($keywords, '-') !== false || strpos($keywords, '*') !== false) {
$results = DB::GetConn()->searchEngine($keywords, $pageLength, "Relevance DESC", "", true); $results = DB::GetConn()->searchEngine($this->classesToSearch, $keywords, $start, $pageLength, "Relevance DESC", "", true);
} else { } else {
$results = DB::GetConn()->searchEngine($keywords, $pageLength); $results = DB::GetConn()->searchEngine($this->classesToSearch, $keywords, $start, $pageLength);
} }
// filter by permission // filter by permission
@ -126,7 +131,7 @@ class SearchForm extends Form {
if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['locale'])) { if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['locale'])) {
Translatable::set_current_locale($origLocale); Translatable::set_current_locale($origLocale);
} }
return $results; return $results;
} }