From 2baeefa6c82e81fea1e089c696edf2645397e9c3 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sat, 27 Jan 2024 00:43:22 +0100
Subject: [PATCH] MAINT: fix merge conflicts
---
.../database/backend/implementation/MySQL/DatabaseUtils.java | 4 +++-
.../backend/implementation/MySQL/MySQLInsertSparseEntity.java | 2 +-
src/main/java/org/caosdb/server/filesystem/Hash.java | 3 ++-
.../java/org/caosdb/server/resource/FileSystemResource.java | 4 ++--
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
index 5383de9b..ccadd6b1 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
@@ -47,6 +47,8 @@ import org.caosdb.server.entity.Message;
import org.caosdb.server.entity.RetrieveEntity;
import org.caosdb.server.entity.StatementStatus;
import org.caosdb.server.entity.wrapper.Property;
+import org.caosdb.server.filesystem.Hash;
+import org.caosdb.server.filesystem.Hasher;
public class DatabaseUtils {
@@ -229,7 +231,7 @@ public class DatabaseUtils {
ret.filePath = bytes2UTF8(rs.getBytes("FilePath"));
ret.fileSize = rs.getLong("FileSize");
- ret.fileHash = bytes2UTF8(rs.getBytes("FileHash"));
+ ret.fileHash = Hash.create(rs.getString("FileHash"), 0, Hasher.SHA512);
ret.versionId = bytes2UTF8(rs.getBytes("Version"));
return ret;
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
index fa70a145..cf17271c 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
@@ -65,7 +65,7 @@ public class MySQLInsertSparseEntity extends MySQLTransaction implements InsertS
insertFilePropsStmt.setString(2, entity.filePath);
insertFilePropsStmt.setLong(3, entity.fileSize);
if (entity.fileHash != null) {
- insertFilePropsStmt.setString(4, entity.fileHash);
+ insertFilePropsStmt.setString(4, entity.fileHash.toString());
} else {
insertFilePropsStmt.setNull(4, Types.VARCHAR);
}
diff --git a/src/main/java/org/caosdb/server/filesystem/Hash.java b/src/main/java/org/caosdb/server/filesystem/Hash.java
index 3b1f7085..b36e7acc 100644
--- a/src/main/java/org/caosdb/server/filesystem/Hash.java
+++ b/src/main/java/org/caosdb/server/filesystem/Hash.java
@@ -86,7 +86,8 @@ public final class Hash implements Serializable {
public String getAlgorithm() {
return algorithm;
- };
+ }
+ ;
@Override
public String toString() {
diff --git a/src/main/java/org/caosdb/server/resource/FileSystemResource.java b/src/main/java/org/caosdb/server/resource/FileSystemResource.java
index 47020a46..15c914f3 100644
--- a/src/main/java/org/caosdb/server/resource/FileSystemResource.java
+++ b/src/main/java/org/caosdb/server/resource/FileSystemResource.java
@@ -101,10 +101,10 @@ public class FileSystemResource extends AbstractCaosDBServerResource {
if (child.isDirectory()) {
celem = new Element("dir");
celem.setAttribute("name", child.getName());
- celem.setAttribute("url", referenceString + child.getName() + "/");
+ celem.setAttribute("url", url + child.getName() + "/");
} else {
celem = getFileElement(specifier, child);
- celem.setAttribute("url", referenceString + child.getName());
+ celem.setAttribute("url", url + child.getName());
}
folder.addContent(celem);
--
GitLab