Fix cmdi double formatting & zip folder path

Author: PrinsINT

server/src/main/kotlin/org/ivdnt/galahad/export/CmdiMetadata.kt

@@ -13,6 +13,7 @@ import org.w3c.dom.Node
 import java.io.OutputStream
 import java.text.SimpleDateFormat
 import java.util.*
+import javax.xml.transform.TransformerFactory
 import javax.xml.transform.dom.DOMSource
 import javax.xml.transform.stream.StreamResult
 
@@ -45,7 +46,7 @@ class CmdiMetadata(val export: DocumentExport) {
         writeCmdHeader()
         writeCmdResources()
         writeCmdComponents()
-        XmlUtil.transformer.transform(DOMSource(xml), StreamResult(out))
+        TransformerFactory.newInstance().newTransformer().transform(DOMSource(xml), StreamResult(out))
     }
 
     /**

server/src/main/kotlin/org/ivdnt/galahad/export/CorpusExport.kt

@@ -61,7 +61,7 @@ class CorpusExport private constructor(
             fileName to { out -> formatMapper(doc,out) }
         }
         val seqCmdi: Sequence<FileMapper> = docs.asSequence().map { doc ->
-            "metadata/CMDI-${doc.uploadedFile}.xml" to { out ->
+            "metadata/CMDI-${doc.uploadedFile.withoutFormatExt}.xml" to { out ->
                 DocumentExport.create(
                     this, doc
                 ).cmdi(out)