diff --git a/pom.xml b/pom.xml index 5a65820890323033d085ee6a5d260849fcd9626c..a6d016d0db8b7c2d17a5a97741819ec4fed8b038 100644 --- a/pom.xml +++ b/pom.xml @@ -1932,8 +1932,8 @@ <dependency> <groupId>fmath</groupId> <artifactId>fmath-latex-mathml</artifactId> - <version>0.5</version> - <!-- need org.jdom 1.1.3, jaxen 1.1.4 and commons-codec --> + <version>3.1</version> + <!-- need org.jdom2 2.0.6 --> </dependency> <dependency> <groupId>jgrapht</groupId> diff --git a/src/main/java/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java b/src/main/java/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java index b9b0c5389e4a64335208139e3afb27d3b9ff0bb6..6a00bb9c25412e49735fda05d05b2e6d8aebfbb7 100644 --- a/src/main/java/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java +++ b/src/main/java/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java @@ -39,7 +39,6 @@ import java.util.zip.ZipOutputStream; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; import org.cyberneko.html.parsers.SAXParser; import org.olat.core.gui.media.MediaResource; import org.olat.core.gui.translator.Translator; @@ -183,19 +182,16 @@ public class QTI21WordExport implements MediaResource { } catch (Exception e) { log.error("", e); } + + AssessmentTest assessmentTest = resolvedAssessmentTest.getRootNodeLookup().extractIfSuccessful(); + String label = assessmentTest.getTitle(); + String secureLabel = StringHelper.transformDisplayNameToFileSystemName(label); - ZipOutputStream zout = null; - try { - AssessmentTest assessmentTest = resolvedAssessmentTest.getRootNodeLookup().extractIfSuccessful(); - - String label = assessmentTest.getTitle(); - String secureLabel = StringHelper.transformDisplayNameToFileSystemName(label); + String file = secureLabel + ".zip"; + hres.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + StringHelper.urlEncodeUTF8(file)); + hres.setHeader("Content-Description", StringHelper.urlEncodeUTF8(label)); - String file = secureLabel + ".zip"; - hres.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + StringHelper.urlEncodeUTF8(file)); - hres.setHeader("Content-Description", StringHelper.urlEncodeUTF8(label)); - - zout = new ZipOutputStream(hres.getOutputStream()); + try(ZipOutputStream zout = new ZipOutputStream(hres.getOutputStream())) { zout.setLevel(9); ZipEntry test = new ZipEntry(secureLabel + ".docx"); @@ -212,7 +208,6 @@ public class QTI21WordExport implements MediaResource { log.error("", e); } finally { latch.countDown(); - IOUtils.closeQuietly(zout); } }