From 0728edf18268f8bd00a78bca3fecf19bfc3bc948 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Fri, 10 Aug 2012 13:35:35 +0000
Subject: [PATCH] SP-203 BIS-126 imporove bahavior of moving, creating files
and directories for feature container datasets
SVN: 26331
---
.../dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java | 5 +++++
.../etl/jython/ImagingDataSetRegistrationTransaction.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java
index 6b8a87eb973..e17820b192d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java
@@ -103,4 +103,9 @@ public class FeatureVectorContainerDataSet extends DataSet<DataSetInformation> i
getRegistrationDetails().setPropertyValue(propertyCode, propertyValue);
}
+ @Override
+ public File getDataSetStagingFolder()
+ {
+ return originalDataset.getDataSetStagingFolder();
+ }
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java
index e259d1395e6..237bf728294 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java
@@ -517,7 +517,7 @@ public class ImagingDataSetRegistrationTransaction extends DataSetRegistrationTr
"Cannot move the files because the original dataset is missing: " + src);
}
- return super.moveFile(src, originalDataSet, getDestinationInOriginal(dstInDataset));
+ return super.moveFile(src, originalDataSet, dstInDataset);
}
return super.moveFile(src, dst, dstInDataset);
--
GitLab