fix commit aefe9d4a5a to use that was created but not used refs BT#12403

pull/2487/head
Nicolas Ducoulombier 9 years ago
parent e98b1db75c
commit dcbb021a4f
  1. 8
      main/exercise/export/aiken/aiken_import.inc.php

@ -132,16 +132,16 @@ function aiken_import_exercise($file)
} }
// find the different manifests for each question and parse them // find the different manifests for each question and parse them
$exerciseHandle = opendir($baseWorkDir); $exerciseHandle = opendir($baseWorkDir.$uploadPath);
$file_found = false; $file_found = false;
$operation = false; $operation = false;
$result = false; $result = false;
// Parse every subdirectory to search txt question files // Parse every subdirectory to search txt question files
while (false !== ($file = readdir($exerciseHandle))) { while (false !== ($file = readdir($exerciseHandle))) {
if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") { if (is_dir($baseWorkDir.'/'.$uploadPath.$file) && $file != "." && $file != "..") {
//find each manifest for each question repository found //find each manifest for each question repository found
$questionHandle = opendir($baseWorkDir.'/'.$file); $questionHandle = opendir($baseWorkDir.'/'.$uploadPath.$file);
while (false !== ($questionFile = readdir($questionHandle))) { while (false !== ($questionFile = readdir($questionHandle))) {
if (preg_match('/.txt$/i', $questionFile)) { if (preg_match('/.txt$/i', $questionFile)) {
$result = aiken_parse_file( $result = aiken_parse_file(
@ -154,7 +154,7 @@ function aiken_import_exercise($file)
} }
} }
} elseif (preg_match('/.txt$/i', $file)) { } elseif (preg_match('/.txt$/i', $file)) {
$result = aiken_parse_file($exercise_info, $baseWorkDir, '', $file); $result = aiken_parse_file($exercise_info, $baseWorkDir.$uploadPath, '', $file);
$file_found = true; $file_found = true;
} }
} }

Loading…
Cancel
Save