add cmdi to export zip

Author: PrinsINT

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

@@ -65,7 +65,8 @@ class CorpusExport private constructor(
     ) {
         val documents = corpus.documents.readAll().filter { DocumentExport.create(this, it).layer != Layer.EMPTY }
         val seq: Sequence<FileMapper> = documents.asSequence().map { doc -> doc.name to { out -> formatMapper(doc, out) } }
-        createZipFile(seq, out)
+        val seqCmdi: Sequence<FileMapper> = documents.asSequence().map { doc -> "metadata/CMDI-${doc.uploadedFile.nameWithoutExtension}.xml" to { out -> DocumentExport.create(this, doc).cmdi(out) } }
+        createZipFile(seq + seqCmdi, out, includeCMDI = true)
     }
 
     companion object {

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

@@ -32,7 +32,7 @@ class DocumentExport private constructor(
 
     fun convert(out: OutputStream): Unit = LayerConverter.create(this).convert(out)
     fun merge(out: OutputStream): Unit = LayerMerger.create(this).merge(out)
-    fun cmdi(): CmdiMetadata = CmdiMetadata(this)
+    fun cmdi(out: OutputStream): Unit = CmdiMetadata(this).write(out)
 
     companion object {
         fun create(export: CorpusExport, doc: Document): DocumentExport = create(export, doc.name)

server/src/main/kotlin/org/ivdnt/galahad/util/ZipUtil.kt

@@ -32,10 +32,10 @@ fun createZipFile(files: Sequence<FileMapper>, out: OutputStream? = null, includ
     }
 
     if (includeCMDI) {
-        val cmdis = listOf("TextProfileINT_GaLAHaD.xml", "TextProfileINT_GaLAHaD.xsd")
+        val cmdis = arrayOf("TextProfileINT_GaLAHaD.xml", "TextProfileINT_GaLAHaD.xsd")
         for (cmdi in cmdis) {
             val cmdiFile = getResourceStream(cmdi)
-            zipStream.putNextEntry(ZipEntry(cmdi))
+            zipStream.putNextEntry(ZipEntry("metadata/$cmdi"))
             zipStream.write(cmdiFile!!.readBytes())
         }
     }