From a393301a288f7053d022604402299a0aa456ef45 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 27 Oct 2014 22:23:26 +0000
Subject: [PATCH] SSDM-1081 add new method to archive folders
SVN: 32670
---
.../dss/generic/shared/ArchiveFolders.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java
index ff1be378657..9e94a60ca46 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java
@@ -32,6 +32,8 @@ public abstract class ArchiveFolders
public abstract File getFolder(DatasetDescription dataSetDescription);
+ public abstract File getFolder(long fileSize);
+
public abstract Collection<File> getAllFolders();
public static ArchiveFolders create(File[] folders, boolean createFolders, Long smallDataSetsSizeLimit)
@@ -124,6 +126,12 @@ public abstract class ArchiveFolders
return dataSetsFolder;
}
+ @Override
+ public File getFolder(long fileSize)
+ {
+ return dataSetsFolder;
+ }
+
@Override
public Collection<File> getAllFolders()
{
@@ -171,7 +179,13 @@ public abstract class ArchiveFolders
dataSetDescription.setDataSetSize(size);
}
- if (dataSetDescription.getDataSetSize() > smallDataSetsSizeLimit)
+ return getFolder(dataSetDescription.getDataSetSize());
+ }
+
+ @Override
+ public File getFolder(long fileSize)
+ {
+ if (fileSize > smallDataSetsSizeLimit)
{
return bigDataSetsFolder;
} else
--
GitLab