From 6eb855d37e5558c063bc40a9663eacf62af9ac44 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 16 Aug 2023 13:07:15 +0200
Subject: [PATCH] Fix wrong url in filesystem response (when using proxies)
---
.../org/caosdb/server/resource/FileSystemResource.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/caosdb/server/resource/FileSystemResource.java b/src/main/java/org/caosdb/server/resource/FileSystemResource.java
index 1e601cb2..7aacad72 100644
--- a/src/main/java/org/caosdb/server/resource/FileSystemResource.java
+++ b/src/main/java/org/caosdb/server/resource/FileSystemResource.java
@@ -86,12 +86,11 @@ public class FileSystemResource extends AbstractCaosDBServerResource {
}
if (file.isDirectory()) {
- String referenceString = getReference().toString();
- if (!referenceString.endsWith("/")) {
- referenceString = referenceString + "/";
- }
+ String path = (specifier.endsWith("/") ? specifier : specifier + "/");
+ String referenceString = getUtils().getServerRootURI() + "/FileSystem/" + path;
+
final Element folder = new Element("dir");
- folder.setAttribute("path", (specifier.endsWith("/") ? specifier : specifier + "/"));
+ folder.setAttribute("path", path);
folder.setAttribute("name", file.getName());
folder.setAttribute("url", referenceString);
--
GitLab