Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,10 @@ public function createExport(
# write files from legacy export run dir to irss
# tmp solution, remove later if no longer needed
$writer = $this->export_handler->consumer()->handler()->exportWriter($element);
$is_container_export = $element->getIRSS()->isContainerExport();
$writer->writeDirectoryRecursive(
$export_info->getLegacyExportRunDir(),
$export_info->getExportFolderName()
($is_container_export) ? '' : $export_info->getExportFolderName()
);

# delete legacy export run dir
Expand Down
10 changes: 7 additions & 3 deletions components/ILIAS/File/classes/class.ilFileExporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,15 @@ public function getXmlRepresentation(string $a_entity, string $a_schema_version,
protected function prepareExportDirectories(
ilFileXMLWriter $writer
): void {
$path = str_replace('\\', '/', $this->exp->getExportDirInContainer());
$path = str_replace('\\', '/', $this->exp->getPathToComponentExpDirInContainer());
$segments = explode('/', $path);
array_shift($segments);
$target_dir_relative = implode('/', $segments) . '/expDir_1';
$target_dir_absolute = rtrim($this->getAbsoluteExportDirectory(), '/') . '/' . $target_dir_relative;
$target_dir_relative = implode('/', $segments);
if ($this->exp->isContainerExport()) {
$target_dir_absolute = rtrim($this->getAbsoluteExportDirectory(), '/') . '/' . $this->exp->getPathToComponentExpDirInContainerWithLeadingSetNumber();
} else {
$target_dir_absolute = rtrim($this->getAbsoluteExportDirectory(), '/') . '/' . $target_dir_relative;
}
ilFileUtils::makeDirParents($target_dir_absolute);
$writer->setFileTargetDirectories(
$target_dir_relative,
Expand Down
Loading