Skip to content
Snippets Groups Projects
Commit 29fbaf62 authored by tpylak's avatar tpylak
Browse files

LMS-1924 access to dataset directory in the overview plugin

SVN: 19120
parent 63837249
No related branches found
No related tags found
No related merge requests found
......@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.dss.generic.server;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
......@@ -111,7 +112,7 @@ public class DatasetImageOverviewServlet extends AbstractDatasetDownloadServlet
ensureDatasetAccessible(datasetCode, session, sessionId);
ResponseContentStream responseStream =
createImageResponse(datasetCode, datasetTypeCode, resolution);
createImageResponse(session, datasetCode, datasetTypeCode, resolution);
if (responseStream != null && operationLog.isDebugEnabled())
{
......@@ -127,12 +128,13 @@ public class DatasetImageOverviewServlet extends AbstractDatasetDownloadServlet
}
}
private ResponseContentStream createImageResponse(String datasetCode, String datasetTypeCode,
ImageResolutionKind resolution)
private ResponseContentStream createImageResponse(HttpSession session, String datasetCode,
String datasetTypeCode, ImageResolutionKind resolution)
{
final IDatasetImageOverviewPlugin plugin =
File datasetRoot = createDataSetRootDirectory(datasetCode, session);
IDatasetImageOverviewPlugin plugin =
configuration.getDatasetImageOverviewPlugin(datasetTypeCode);
return plugin.createImageResponse(datasetCode, datasetTypeCode, resolution);
return plugin.createImageOverview(datasetCode, datasetTypeCode, datasetRoot, resolution);
}
// static initialization is used to simplify usage of properties
......
......@@ -16,6 +16,8 @@
package ch.systemsx.cisd.openbis.dss.generic.server;
import java.io.File;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ImageResolutionKind;
/**
......@@ -27,9 +29,10 @@ public interface IDatasetImageOverviewPlugin
{
/**
* @param datasetRoot directory in the store where dataset can be found.
* @return {@link ResponseContentStream} with an image in given resolution for specified dataset
*/
ResponseContentStream createImageResponse(String datasetCode, String datasetTypeCode,
ImageResolutionKind resolution);
ResponseContentStream createImageOverview(String datasetCode, String datasetTypeCode,
File datasetRoot, ImageResolutionKind resolution);
}
......@@ -55,8 +55,8 @@ public class DemoOverviewPlugin implements IDatasetImageOverviewPlugin
label = PropertyUtils.getProperty(properties, LABEL_PROPERTY_KEY, "(no label)");
}
public ResponseContentStream createImageResponse(String datasetCode, String datasetTypeCode,
ImageResolutionKind resolution)
public ResponseContentStream createImageOverview(String datasetCode, String datasetTypeCode,
File datasetRoot, ImageResolutionKind resolution)
{
System.out.println(String.format("%s (%s): create image for\n"
+ "\tdataset code: %s\n\tdataset type: %s\n\tresolution: %s", this.getClass()
......
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