MAINT: fix merge conflicts

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;

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);
         }

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() {

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);