L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bad regular expression logic in short answer

Browse Source
This commit is contained in:
moodler
2004-07-27 08:29:33 +00:00
parent b435823477
commit cc03ed4016
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/lib.php
+20 -12
View File
@@ -1846,25 +1846,33 @@ function quiz_grade_attempt_question_result($question,
$correct[] = $answer->answer;
}
if (!$answer->usecase) { // Don't compare case
$answer->answer = strtolower($answer->answer);
$question->answer = strtolower($question->answer);
$answer->answer = moodle_strtolower($answer->answer);
$question->answer = moodle_strtolower($question->answer);
}
$potentialgrade = (float)$answer->fraction * $question->grade;
if ($potentialgrade >= $grade and (strpos(' '.$answer->answer, '*'))) {
$answer->answer = str_replace('\*','@@@@@@',$answer->answer);
$answer->answer = str_replace('*','.*',$answer->answer);
$answer->answer = str_replace('@@@@@@', '\*',$answer->answer);
$answer->answer = str_replace('+', '\+',$answer->answer);
if (eregi('^'.$answer->answer.'$', $question->answer)) {
if ($potentialgrade >= $grade) {
if ((strpos(' '.$answer->answer, '*'))) {
$search = array('\\', '+', '(', ')', '[', ']', '-');
$replace = array('\\\\', '\+', '\(', '\)', '\[', '\]', '\-');
$answer->answer = str_replace('\*','@@@@@@',$answer->answer);
$answer->answer = str_replace('*','.*',$answer->answer);
$answer->answer = str_replace($search, $replace, $answer->answer);
$answer->answer = str_replace('@@@@@@', '\*',$answer->answer);
if (eregi('^'.$answer->answer.'$', $question->answer)) {
$feedback[0] = $answer->feedback;
$grade = $potentialgrade;
}
} else if ($answer->answer == $question->answer) {
$feedback[0] = $answer->feedback;
$grade = $potentialgrade;
}
} else if ($answer->answer == $question->answer) {
$feedback[0] = $answer->feedback;
$grade = $potentialgrade;
}
}