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

MDL-60008 assign: Best effort document conversion

Browse Source 
Basically we should produce a combined PDF from all the files that it was possible to convert.
If any one submission input file fails conversion, it should just be omitted in the result.
This commit is contained in:
Damyon Wiese 2017-11-22 15:11:45 +08:00
parent cb7f6a6f99
commit 0888ebc1f9
1 changed files with 7 additions and 4 deletions

11
mod/assign/feedback/editpdf/classes/combined_document.php

@ -76,6 +76,9 @@ class combined_document {
/**
* Check the current status of the document combination.
* Note that the combined document may not contain all the source files if some of the
* source files were not able to be converted. An example is an audio file with a pdf cover sheet. Only
* the cover sheet will be included in the combined document.
*
* @return int
*/
@ -107,9 +110,6 @@ class combined_document {
case \core_files\conversion::STATUS_PENDING:
$pending = true;
break;
case \core_files\conversion::STATUS_FAILED:
return self::STATUS_FAILED;
}
}
}
@ -235,7 +235,10 @@ class combined_document {
// Note: We drop non-compatible files.
$compatiblepdf = false;
if (is_a($file, \core_files\conversion::class)) {
$compatiblepdf = pdf::ensure_pdf_compatible($file->get_destfile());
$status = $file->get('status');
if ($status == \core_files\conversion::STATUS_COMPLETE) {
$compatiblepdf = pdf::ensure_pdf_compatible($file->get_destfile());
}
} else {
$compatiblepdf = pdf::ensure_pdf_compatible($file);
}