From 021337ec27e84f6f35a130e1df1b430a5a40e59e Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 13 Apr 2011 07:36:38 +0000
Subject: [PATCH] [LMS-2171] minor: improved logging
SVN: 20856
---
.../dss/generic/server/DatasetDownloadServlet.java | 6 +++---
.../openbis/dss/generic/server/RenderingContext.java | 2 +-
.../generic/server/DatasetDownloadServletTest.java | 11 ++++++-----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
index e08ac8adc4c..27f04f56603 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
@@ -344,8 +344,8 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
IHierarchicalContentNode node = renderingContext.getContentNode();
if (node.exists() == false)
{
- throw new EnvironmentFailureException("Resource '" + node.getName()
- + "' does not exist.");
+ throw new EnvironmentFailureException("Resource '" + node.getRelativePath()
+ + "' does not exist in data set '" + dataSetCode + "'.");
}
// If we want to browse a directory, we need a whole dataset metadata from openbis to
@@ -434,7 +434,7 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
{
operationLog.info(String.format("For data set '%s' show directory '%s'",
dataSet.getCode(),
- (dirNode.getRelativePath() == null) ? "(root)" : dirNode.getRelativePath()));
+ (dirNode.getRelativePath() == null) ? "/" : dirNode.getRelativePath()));
}
IDirectoryRenderer directoryRenderer =
rendererFactory.createDirectoryRenderer(renderingContext);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
index 6b132317e0f..b65b68e1707 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
@@ -79,7 +79,7 @@ final class RenderingContext
public final IHierarchicalContentNode getContentNode()
{
- return rootContent.getNode(relativePathOrNull);
+ return fileNode;
}
public final File getRootDir()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
index 8d2a4b2eb7e..9a5bfc89a6d 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
@@ -227,8 +227,7 @@ public class DatasetDownloadServletTest
String normalizedLogContent = getNormalizedLogContent();
assertContains(getSessionCreationLogMessage() + OSUtilities.LINE_SEPARATOR + LOG_INFO
+ "Data set '1234-1' obtained from openBIS server.", normalizedLogContent);
- assertContains(LOG_INFO + "For data set '1234-1' show directory '(root)'",
- normalizedLogContent);
+ assertContains(LOG_INFO + "For data set '1234-1' show directory '/'", normalizedLogContent);
context.assertIsSatisfied();
}
@@ -287,7 +286,8 @@ public class DatasetDownloadServletTest
DatasetDownloadServlet servlet = createServlet();
servlet.doGet(request, response);
String pageContent = writer.toString();
- String snippet = "Resource 'blabla' does not exist.";
+ String snippet =
+ "Resource 'blabla' does not exist in data set '" + EXAMPLE_DATA_SET_CODE + "'.";
assertEquals("Text snippet >" + snippet + "< not found in following page content: "
+ pageContent, true, pageContent.indexOf(snippet) > 0);
String logContent = logRecorder.getLogContent();
@@ -498,8 +498,9 @@ public class DatasetDownloadServletTest
DatasetDownloadServlet servlet = createServlet();
servlet.doGet(request, response);
assertEquals("<html><body><h1>Error</h1>" + OSUtilities.LINE_SEPARATOR
- + "Resource 'blabla' does not exist." + OSUtilities.LINE_SEPARATOR
- + "</body></html>" + OSUtilities.LINE_SEPARATOR, writer.toString());
+ + "Resource 'blabla' does not exist in data set '" + EXAMPLE_DATA_SET_CODE + "'."
+ + OSUtilities.LINE_SEPARATOR + "</body></html>" + OSUtilities.LINE_SEPARATOR,
+ writer.toString());
String logContent = getNormalizedLogContent();
String[] logContentLines = logContent.split("\n");
// Skip the first line which has information about session creation
--
GitLab