From e9a5f140f73bf531166c104693301b7bcc8c6215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Thu, 2 Aug 2018 10:48:43 +0200
Subject: [PATCH] fix: construct correct URL for BDS
---
.../haas_spim_benchmark/core/BenchmarkJobManager.java | 4 ++--
.../haas_spim_benchmark/ui/BenchmarkSPIMControl.java | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
index 21d82ca2..500dfdd4 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
@@ -285,8 +285,8 @@ public class BenchmarkJobManager implements Closeable {
return job.getOutputDirectory();
}
- public Path getResultXML() {
- return Paths.get(job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN) + ".xml");
+ public String getResultXML() {
+ return job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN) + ".xml";
}
public List<FileTransferInfo> getFileTransferInfo() {
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
index ccaf1994..429f2eb5 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
@@ -9,7 +9,6 @@ import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.EnumSet;
@@ -384,7 +383,7 @@ public class BenchmarkSPIMControl extends BorderPane implements
}
private void openBigDataViewer(BenchmarkJob job) {
- Path resultXML = job.getResultXML();
+ String resultXML = job.getResultXML();
Path localPathToResultXML = job.getOutputDirectory().resolve(resultXML);
String openFile;
if (Files.exists(localPathToResultXML)) {
@@ -402,13 +401,13 @@ public class BenchmarkSPIMControl extends BorderPane implements
}
}
- private String getPathToBDSForData(BenchmarkJob job, Path resultXML) {
- Path changed = Paths.get(""+job.getId() ).resolve(resultXML);
+ private String getPathToBDSForData(BenchmarkJob job, String resultXML) {
+ String changed = job.getId() + "/" + resultXML;
MessageDigest digest;
try {
digest = MessageDigest.getInstance("SHA-1");
digest.reset();
- digest.update(changed.toString().getBytes("utf8"));
+ digest.update(changed.getBytes("utf8"));
String sha1 = String.format("%040x", new BigInteger(1, digest.digest()));
String result = Constants.BDS_ADDRESS + sha1 + "/";
if (log.isDebugEnabled()) {
--
GitLab