From e387aeded7180b3f41a7227ad06249af254b34e8 Mon Sep 17 00:00:00 2001
From: Arvid Ihrig <ihrig@fhi-berlin.mpg.de>
Date: Wed, 1 Aug 2018 12:53:58 +0200
Subject: [PATCH] Integrated Pipeline: fixed an incorrect URI

---
 .../integrated_pipeline/messages/FileParsingSignals.scala       | 2 +-
 .../CalculationParsingEngineSpec.scala                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/integrated-pipeline/src/main/scala/eu/nomad_lab/integrated_pipeline/messages/FileParsingSignals.scala b/integrated-pipeline/src/main/scala/eu/nomad_lab/integrated_pipeline/messages/FileParsingSignals.scala
index 53b56a7d..74d12ca7 100644
--- a/integrated-pipeline/src/main/scala/eu/nomad_lab/integrated_pipeline/messages/FileParsingSignals.scala
+++ b/integrated-pipeline/src/main/scala/eu/nomad_lab/integrated_pipeline/messages/FileParsingSignals.scala
@@ -32,7 +32,7 @@ case class CandidateFound(
 
   def mainFileUri: String = {
     fileTree.treeType match {
-      case TreeType.Zip => "nmd://" + relativePath.toString
+      case TreeType.Zip => s"nmd://${fileTree.archiveId}/${relativePath.toString}"
       case TreeType.Directory => fileTree.treeBasePath.resolve(relativePath).toAbsolutePath.toUri.toString
       case _ => "unknown://${treeTask.treeBasePath.resolve(relativePath).toAbsolutePath.toString}"
     }
diff --git a/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
index a3193eaa..7c797bb6 100644
--- a/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
@@ -169,7 +169,7 @@ class CalculationParsingEngineSpec extends WordSpec with MockitoSugar with TestD
 
       "parse the temporarily extracted main file when handling zip archives" in {
         val f = new Fixture
-        val treeTask = aFileTree().withTreeType(TreeType.Zip)
+        val treeTask = aFileTree().withTreeType(TreeType.Zip).withBasePath(s"/foo/R${"x" * 28}.zip")
         val extractedPath = Paths.get("/tmp/extracted/magic")
         val task = sampleParseRequest.withFileTree(treeTask).withExtractedPath(Some(extractedPath))
         f.worker.processSignal(task)
-- 
GitLab