Skip to content
Snippets Groups Projects
Commit e9a5f140 authored by Jan Kožusznik's avatar Jan Kožusznik
Browse files

fix: construct correct URL for BDS

parent e924124d
No related branches found
No related tags found
No related merge requests found
...@@ -285,8 +285,8 @@ public class BenchmarkJobManager implements Closeable { ...@@ -285,8 +285,8 @@ public class BenchmarkJobManager implements Closeable {
return job.getOutputDirectory(); return job.getOutputDirectory();
} }
public Path getResultXML() { public String getResultXML() {
return Paths.get(job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN) + ".xml"); return job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN) + ".xml";
} }
public List<FileTransferInfo> getFileTransferInfo() { public List<FileTransferInfo> getFileTransferInfo() {
......
...@@ -9,7 +9,6 @@ import java.io.UnsupportedEncodingException; ...@@ -9,7 +9,6 @@ import java.io.UnsupportedEncodingException;
import java.math.BigInteger; import java.math.BigInteger;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.EnumSet; import java.util.EnumSet;
...@@ -384,7 +383,7 @@ public class BenchmarkSPIMControl extends BorderPane implements ...@@ -384,7 +383,7 @@ public class BenchmarkSPIMControl extends BorderPane implements
} }
private void openBigDataViewer(BenchmarkJob job) { private void openBigDataViewer(BenchmarkJob job) {
Path resultXML = job.getResultXML(); String resultXML = job.getResultXML();
Path localPathToResultXML = job.getOutputDirectory().resolve(resultXML); Path localPathToResultXML = job.getOutputDirectory().resolve(resultXML);
String openFile; String openFile;
if (Files.exists(localPathToResultXML)) { if (Files.exists(localPathToResultXML)) {
...@@ -402,13 +401,13 @@ public class BenchmarkSPIMControl extends BorderPane implements ...@@ -402,13 +401,13 @@ public class BenchmarkSPIMControl extends BorderPane implements
} }
} }
private String getPathToBDSForData(BenchmarkJob job, Path resultXML) { private String getPathToBDSForData(BenchmarkJob job, String resultXML) {
Path changed = Paths.get(""+job.getId() ).resolve(resultXML); String changed = job.getId() + "/" + resultXML;
MessageDigest digest; MessageDigest digest;
try { try {
digest = MessageDigest.getInstance("SHA-1"); digest = MessageDigest.getInstance("SHA-1");
digest.reset(); digest.reset();
digest.update(changed.toString().getBytes("utf8")); digest.update(changed.getBytes("utf8"));
String sha1 = String.format("%040x", new BigInteger(1, digest.digest())); String sha1 = String.format("%040x", new BigInteger(1, digest.digest()));
String result = Constants.BDS_ADDRESS + sha1 + "/"; String result = Constants.BDS_ADDRESS + sha1 + "/";
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment