mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-02 22:25:04 +02:00
Code Issues Projects Releases Wiki Activity

Better behaviour for "-" course searches under MSSQL and Oracle. MDL-7312 ; merged from 19_STABLE

Browse Source
This commit is contained in:
stronk7 2008-01-01 12:03:00 +00:00
parent 8edf2cdce3
commit 0f62a5b5bb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/datalib.php
View File

@ -1058,9 +1058,15 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record
foreach ($searchterms as $searchterm) {
$NOT = ''; /// Initially we aren't going to perform NOT LIKE searches, only MSSQL and Oracle
/// will use it to simulate the "-" operator with LIKE clause
/// Under Oracle and MSSQL, trim the + and - operators and perform
/// simpler LIKE search
/// simpler LIKE (or NOT LIKE) queries
if ($CFG->dbfamily == 'oracle' || $CFG->dbfamily == 'mssql') {
if (substr($searchterm, 0, 1) == '-') {
$NOT = ' NOT ';
}
$searchterm = trim($searchterm, '+-');
}
@ -1080,8 +1086,8 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record
$summarysearch .= " c.summary $NOTREGEXP '(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)' ";
$fullnamesearch .= " c.fullname $NOTREGEXP '(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)' ";
} else {
$summarysearch .= ' c.summary '. $LIKE .' \'%'. $searchterm .'%\' ';
$fullnamesearch .= ' c.fullname '. $LIKE .' \'%'. $searchterm .'%\' ';
$summarysearch .= ' summary '. $NOT . $LIKE .' \'%'. $searchterm .'%\' ';
$fullnamesearch .= ' fullname '. $NOT . $LIKE .' \'%'. $searchterm .'%\' ';
}
}
@ -1092,7 +1098,7 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record
FROM {$CFG->prefix}course c
JOIN {$CFG->prefix}context ctx
ON (c.id = ctx.instanceid AND ctx.contextlevel=".CONTEXT_COURSE.")
WHERE ( $fullnamesearch OR $summarysearch )
WHERE (( $fullnamesearch ) OR ( $summarysearch ))
AND category > 0
ORDER BY " . $sort;