Skip to content
Snippets Groups Projects
Commit dd6344a8 authored by Isabel Uffinger's avatar Isabel Uffinger
Browse files

show wrong proformaversion as error

parent 7c4f019f
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,7 @@ class qtype_moopt_external extends external_api { ...@@ -42,7 +42,7 @@ class qtype_moopt_external extends external_api {
'taskuuid' => new external_value(PARAM_RAW, 'task\'s uuid', VALUE_OPTIONAL), 'taskuuid' => new external_value(PARAM_RAW, 'task\'s uuid', VALUE_OPTIONAL),
'maxscoregradinghints' => new external_value(PARAM_FLOAT, 'maximum score', VALUE_OPTIONAL), 'maxscoregradinghints' => new external_value(PARAM_FLOAT, 'maximum score', VALUE_OPTIONAL),
'filesdisplayedingeneralfeedback' => new external_value(PARAM_RAW, 'general feedback', VALUE_OPTIONAL), 'filesdisplayedingeneralfeedback' => new external_value(PARAM_RAW, 'general feedback', VALUE_OPTIONAL),
'enablefileinput' => new external_value(PARAM_BOOL, 'Enable file submissions'), 'enablefileinput' => new external_value(PARAM_BOOL, 'Enable file submissions', VALUE_OPTIONAL),
'freetextfilesettings' => new external_multiple_structure( 'freetextfilesettings' => new external_multiple_structure(
new external_single_structure( new external_single_structure(
array( array(
...@@ -56,7 +56,6 @@ class qtype_moopt_external extends external_api { ...@@ -56,7 +56,6 @@ class qtype_moopt_external extends external_api {
) )
,'Free text settings', VALUE_OPTIONAL), ,'Free text settings', VALUE_OPTIONAL),
'moodleValidationProformaNamespace' => new external_value(PARAM_TEXT, 'detected namespace', VALUE_OPTIONAL), 'moodleValidationProformaNamespace' => new external_value(PARAM_TEXT, 'detected namespace', VALUE_OPTIONAL),
'moodleValidationWarningInvalidNamespace' => new external_value(PARAM_TEXT, 'warning message in case of invalid XML namespace', VALUE_OPTIONAL),
'moodleValidationWarnings' => new external_multiple_structure( 'moodleValidationWarnings' => new external_multiple_structure(
new external_single_structure( new external_single_structure(
array( array(
...@@ -96,8 +95,7 @@ class qtype_moopt_external extends external_api { ...@@ -96,8 +95,7 @@ class qtype_moopt_external extends external_api {
$returnval = array(); $returnval = array();
if ($namespace == null) { if ($namespace == null) {
$returnval['error'] = get_string('invalidproformanamespace', 'qtype_moopt',
$returnval['moodleValidationWarningInvalidNamespace'] = get_string('invalidproformanamespace', 'qtype_moopt',
implode(", ", PROFORMA_TASK_XML_NAMESPACES)); implode(", ", PROFORMA_TASK_XML_NAMESPACES));
} else { } else {
...@@ -196,7 +194,7 @@ class qtype_moopt_external extends external_api { ...@@ -196,7 +194,7 @@ class qtype_moopt_external extends external_api {
$filecontent = get_text_content_from_file($usercontext, $draftid, $keepfilename, $filecontent = get_text_content_from_file($usercontext, $draftid, $keepfilename,
$pathinfo['dirname'] . '/', $pathinfo['basename'], true, $encoding); $pathinfo['dirname'] . '/', $pathinfo['basename'], true, $encoding);
if($filecontent === null){ if($filecontent === null){
$returnval['error'] = "Das Encoding der Datei ".$pathinfo['basename']." konnte nicht erkannt werden"; $returnval['error'] = "Encoding of file ".$pathinfo['basename']." couldn't be detected.";
} }
$defaultfilename = basename($child->nodeValue); $defaultfilename = basename($child->nodeValue);
$fileid = $file->attributes->getNamedItem('id')->nodeValue; $fileid = $file->attributes->getNamedItem('id')->nodeValue;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment