OO-3306: replace the offline theme by the light theme in archive of QTI 1.2 (2. variant)

src/main/java/org/olat/course/archiver/FormatConfigHelper.java

@@ -22,6 +22,7 @@ package org.olat.course.archiver;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.prefs.Preferences;
 import org.olat.core.util.xml.XStreamHelper;
 import org.olat.course.nodes.ArchiveOptions;
@@ -50,8 +51,11 @@ public class FormatConfigHelper {
 			try {
 				Preferences guiPrefs = ureq.getUserSession().getGuiPreferences();
 				String formatConfigString = (String) guiPrefs.get(ExportOptionsController.class, QTI_EXPORT_ITEM_FORMAT_CONFIG);
-				Object formatObject = configXstream.fromXML(formatConfigString);
-				formatConfig = (ExportFormat) formatObject;
+				if(StringHelper.containsNonWhitespace(formatConfigString)) {
+					formatConfig = (ExportFormat)configXstream.fromXML(formatConfigString);
+				} else {
+					formatConfig = new ExportFormat(true, true, true, true, true);
+				}
 			} catch (Exception e) {
 				log.error("could not establish object from xml", e);
 				formatConfig = new ExportFormat(true, true, true, true, true);

src/main/java/org/olat/ims/qti/resultexport/QTI12ResultsExportMediaResource.java

@@ -240,8 +240,10 @@ public class QTI12ResultsExportMediaResource implements MediaResource {
 		convertToZipEntry(zout, exportFolderName + "/index.html", usersHTML);
 		
 		//Copy resource files or file trees to export file tree 
-		File sasstheme = new File(WebappHelper.getContextRealPath("/static/offline/qti"));
-		fsToZip(zout, sasstheme.toPath(), exportFolderName + "/css/offline/qti/");
+		File theme = new File(WebappHelper.getContextRealPath("/static/themes/light/theme.css"));
+		ZipUtil.addFileToZip(exportFolderName + "/css/offline/qti/theme.css", theme, zout);
+		File themeMap = new File(WebappHelper.getContextRealPath("/static/themes/light/theme.css.map"));
+		ZipUtil.addFileToZip(exportFolderName + "/css/offline/qti/theme.css.map", themeMap, zout);
 		
 		File fontawesome = new File(WebappHelper.getContextRealPath("/static/font-awesome"));
 		fsToZip(zout, fontawesome.toPath(), exportFolderName + "/css/font-awesome/");